From gerrit-no-reply at lists.osmocom.org Wed Jan 1 10:01:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 10:01:53 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 10:01:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 10:09:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 10:09:20 +0000 Subject: Change in osmo-pcu[master]: Split identity_lv param into mi+mi_len In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16673 ) Change subject: Split identity_lv param into mi+mi_len ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 Gerrit-Change-Number: 16673 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 10:09:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 10:22:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 10:22:45 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Patch Set 4: > error: no matching function for call to ?BTS::add_paging(int, const uint8_t*&, uint8_t&)? You may need to rebase it on top of #16673. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 10:22:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 10:22:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 10:22:54 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 10:22:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 13:00:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 13:00:17 +0000 Subject: Change in libosmo-abis[master]: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16692 ) Change subject: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered ...................................................................... input/ipa_keepalive.c: make sure IPA keepalive FSM is registered Change-Id: I36997b31f50fb1e051686a58dac09bc9ed391d17 Fixes: CID#206090 --- M src/input/ipa_keepalive.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/92/16692/1 diff --git a/src/input/ipa_keepalive.c b/src/input/ipa_keepalive.c index d8eec77..172a36f 100644 --- a/src/input/ipa_keepalive.c +++ b/src/input/ipa_keepalive.c @@ -213,7 +213,7 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&ipa_keepalive_fsm); + OSMO_ASSERT(osmo_fsm_register(&ipa_keepalive_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I36997b31f50fb1e051686a58dac09bc9ed391d17 Gerrit-Change-Number: 16692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 13:06:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 13:06:22 +0000 Subject: Change in osmo-iuh[master]: osmo-hnbgw: make sure osmo_ss7_init() executed successfully References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16693 ) Change subject: osmo-hnbgw: make sure osmo_ss7_init() executed successfully ...................................................................... osmo-hnbgw: make sure osmo_ss7_init() executed successfully Change-Id: Ia9ecf903e79b282aa4fa88a291424681d0fe9d89 Fixes: CID#206089 --- M src/hnbgw.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/93/16693/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 0db04af..70ee25b 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -536,7 +536,11 @@ if (rc < 0) exit(1); - osmo_ss7_init(); + rc = osmo_ss7_init(); + if (rc < 0) { + LOGP(DMAIN, LOGL_FATAL, "osmo_ss7_init() failed with rc=%d\n", rc); + exit(1); + } vty_info.copyright = osmo_hnbgw_copyright; vty_init(&vty_info); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia9ecf903e79b282aa4fa88a291424681d0fe9d89 Gerrit-Change-Number: 16693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:09:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:09:03 +0000 Subject: Change in libosmo-abis[master]: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16692 ) Change subject: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I36997b31f50fb1e051686a58dac09bc9ed391d17 Gerrit-Change-Number: 16692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 16:09:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:09:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:09:04 +0000 Subject: Change in libosmo-abis[master]: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16692 ) Change subject: input/ipa_keepalive.c: make sure IPA keepalive FSM is registered ...................................................................... input/ipa_keepalive.c: make sure IPA keepalive FSM is registered Change-Id: I36997b31f50fb1e051686a58dac09bc9ed391d17 Fixes: CID#206090 --- M src/input/ipa_keepalive.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/ipa_keepalive.c b/src/input/ipa_keepalive.c index d8eec77..172a36f 100644 --- a/src/input/ipa_keepalive.c +++ b/src/input/ipa_keepalive.c @@ -213,7 +213,7 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&ipa_keepalive_fsm); + OSMO_ASSERT(osmo_fsm_register(&ipa_keepalive_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I36997b31f50fb1e051686a58dac09bc9ed391d17 Gerrit-Change-Number: 16692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:09:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:09:20 +0000 Subject: Change in osmo-iuh[master]: osmo-hnbgw: make sure osmo_ss7_init() executed successfully In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16693 ) Change subject: osmo-hnbgw: make sure osmo_ss7_init() executed successfully ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia9ecf903e79b282aa4fa88a291424681d0fe9d89 Gerrit-Change-Number: 16693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jan 2020 16:09:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:09:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:09:22 +0000 Subject: Change in osmo-iuh[master]: osmo-hnbgw: make sure osmo_ss7_init() executed successfully In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16693 ) Change subject: osmo-hnbgw: make sure osmo_ss7_init() executed successfully ...................................................................... osmo-hnbgw: make sure osmo_ss7_init() executed successfully Change-Id: Ia9ecf903e79b282aa4fa88a291424681d0fe9d89 Fixes: CID#206089 --- M src/hnbgw.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index 0db04af..70ee25b 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -536,7 +536,11 @@ if (rc < 0) exit(1); - osmo_ss7_init(); + rc = osmo_ss7_init(); + if (rc < 0) { + LOGP(DMAIN, LOGL_FATAL, "osmo_ss7_init() failed with rc=%d\n", rc); + exit(1); + } vty_info.copyright = osmo_hnbgw_copyright; vty_init(&vty_info); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia9ecf903e79b282aa4fa88a291424681d0fe9d89 Gerrit-Change-Number: 16693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:09:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:09:56 +0000 Subject: Change in osmo-pcu[master]: fix typo in log message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16676 ) Change subject: fix typo in log message ...................................................................... fix typo in log message Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index beb2c13..da221f4 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -607,7 +607,7 @@ } /* set control ts to current MS's TS, until assignment complete */ - LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assinment is complete.\n", + LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n", ul_tbf->control_ts, ts_no); ul_tbf->control_ts = ts_no; diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 1adc8f7..63fd515 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1546,7 +1546,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++ @@ -1628,7 +1628,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++ @@ -1758,7 +1758,7 @@ TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed Modifying MS object, TLLI = 0xf5667788, TA 220 -> 7 -TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS Received RTS for PDCH: TRX=0 TS=7 FN=2654335 block_nr=11 scheduling USF=0 for required uplink resource of UL TFI=0 TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1825,7 +1825,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1918,7 +1918,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI 0011223344): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1997,7 +1997,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -2148,7 +2148,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -3173,7 +3173,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -3265,7 +3265,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -5904,7 +5904,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -6069,7 +6069,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -6414,7 +6414,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 Gerrit-Change-Number: 16676 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:10:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:10:05 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Log BVCI PTP value upon msg recv Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 8ce1342..6435d99 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -433,7 +433,7 @@ } else { - LOGP(DBSSGP, LOGL_DEBUG, "rx BVCI_PTP gprs_bssgp_rx_ptp\n"); + LOGP(DBSSGP, LOGL_DEBUG, "rx BVCI_PTP=%u gprs_bssgp_rx_ptp\n", ns_bvci); rc = gprs_bssgp_pcu_rx_ptp(msg, &tp, bctx); } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:10:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:10:16 +0000 Subject: Change in osmo-pcu[master]: Split identity_lv param into mi+mi_len In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16673 ) Change subject: Split identity_lv param into mi+mi_len ...................................................................... Split identity_lv param into mi+mi_len It's not really needed to have those together in some function calls, and makes it more difficult to follow the code. Furthermore, new callers not having content already aligned (len+value) will be using these functions in forthcoming commits. Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 --- M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp M src/pdch.cpp M src/pdch.h 5 files changed, 11 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index c8b6375..71a2f06 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -38,6 +38,7 @@ #include #include #include + #include #include #include #include @@ -354,7 +355,7 @@ m_pollController.expireTimedout(fn, max_delay); } -int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv) +int BTS::add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len) { uint8_t l, trx, ts, any_tbf = 0; struct gprs_rlcmac_tbf *tbf; @@ -370,7 +371,7 @@ LOGP(DRLCMAC, LOGL_INFO, "Add RR paging: chan-needed=%d MI=%s\n", - chan_needed, osmo_hexdump(identity_lv + 1, identity_lv[0])); + chan_needed, osmo_mi_name(mi, mi_len)); /* collect slots to page * Mark slots for every TBF, but only mark one of it. @@ -414,7 +415,7 @@ for (ts = 0; ts < 8; ts++) { if ((slot_mask[trx] & (1 << ts))) { /* schedule */ - if (!m_bts.trx[trx].pdch[ts].add_paging(chan_needed, identity_lv)) + if (!m_bts.trx[trx].pdch[ts].add_paging(chan_needed, mi, mi_len)) return -ENOMEM; LOGP(DRLCMAC, LOGL_INFO, "Paging on PACCH of TRX=%d TS=%d\n", trx, ts); diff --git a/src/bts.h b/src/bts.h index 7ef5a3f..0eaab85 100644 --- a/src/bts.h +++ b/src/bts.h @@ -290,7 +290,7 @@ int current_frame_number() const; /** add paging to paging queue(s) */ - int add_paging(uint8_t chan_needed, uint8_t *identity_lv); + int add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len); gprs_rlcmac_dl_tbf *dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); gprs_rlcmac_ul_tbf *ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 98e697d..bac0e56 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -644,8 +644,8 @@ return -EINVAL; } - return BTS::main_bts()->add_paging(pag_req->chan_needed, - pag_req->identity_lv); + return BTS::main_bts()->add_paging(pag_req->chan_needed, &pag_req->identity_lv[1], + pag_req->identity_lv[0]); } static int pcu_rx_susp_req(struct gsm_pcu_if_susp_req *susp_req) diff --git a/src/pdch.cpp b/src/pdch.cpp index da221f4..e15af2c 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -251,14 +251,15 @@ return msg; } -bool gprs_rlcmac_pdch::add_paging(uint8_t chan_needed, uint8_t *identity_lv) +bool gprs_rlcmac_pdch::add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len) { struct gprs_rlcmac_paging *pag = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_paging); if (!pag) return false; pag->chan_needed = chan_needed; - memcpy(pag->identity_lv, identity_lv, identity_lv[0] + 1); + pag->identity_lv[0] = mi_len; + memcpy(&pag->identity_lv[1], mi, mi_len); llist_add(&pag->list, &paging_list); diff --git a/src/pdch.h b/src/pdch.h index d55f58e..821fb90 100644 --- a/src/pdch.h +++ b/src/pdch.h @@ -48,7 +48,7 @@ struct gprs_rlcmac_paging *dequeue_paging(); struct msgb *packet_paging_request(); - bool add_paging(uint8_t chan_needed, uint8_t *identity_lv); + bool add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len); void free_resources(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 Gerrit-Change-Number: 16673 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:11:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:11:09 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-Comment-Date: Wed, 01 Jan 2020 16:11:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:12:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:12:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 ) Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 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: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jan 2020 16:12:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 16:12:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jan 2020 16:12:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 ) Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc Related: OS#4336, OS#4337 Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 4 files changed, 78 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index cd1a114..1ce0b69 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -642,13 +642,13 @@ setverdict(pass); } -function f_expect_lu_reject() runs on BSC_ConnHdlr { +function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr { var PDU_DTAP_MT dtap_mt; timer T := 5.0; T.start; alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(cause))) { setverdict(pass); } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e2728d3..05d0ef6 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -561,6 +561,61 @@ vc_conn.done; } +/* Proceed with LU but never receive an TMSI Realloc from MS after LU Accept (OS#4337). + * TS 24.008 sec 4.3.1.5 states MSC should simply release all MM connections. + */ +friend function f_tc_lu_imsi_timeout_tmsi_realloc(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + + f_init_handler(pars); + + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi); + var PDU_DTAP_MT dtap_mt; + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + if (g_pars.ran_is_geran) { + f_bssap_compl_l3(l3_lu); + if (g_pars.send_early_cm) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + } + } else { + f_ranap_initial_ue(l3_lu); + } + + f_mm_imei_early(); + f_mm_common(); + f_msc_lu_hlr(); + f_mm_imei(); + + alt { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt {} + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(fail, "Expected LU ACK, but received LU REJ"); + mtc.stop; + } + } + + /* currently (due to bug OS#4337), an extra LU reject is received before + terminating the connection. Enabling following line makes the test + pass: */ + //f_expect_lu_reject('16'O); /* Cause: congestion */ + + /* f_expect_lu_reject() already waits for T"-1" (X1, 5 seconds), but give some + extra time to avoid race conditons... */ + f_expect_clear(7.0); + + setverdict(pass); +} +testcase TC_lu_imsi_timeout_tmsi_realloc() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_tmsi_realloc), 5); + vc_conn.done; +} + /* Send CM SERVICE REQ for IMSI that has never performed LU before */ friend function f_tc_cmserv_imsi_unknown(charstring id, BSC_ConnHdlrPars pars) @@ -5719,6 +5774,7 @@ execute( TC_lu_imsi_timeout_gsup() ); execute( TC_lu_imsi_auth_tmsi() ); execute( TC_lu_imsi_auth3g_tmsi() ); + execute( TC_lu_imsi_timeout_tmsi_realloc() ); execute( TC_cmserv_imsi_unknown() ); execute( TC_lu_and_mo_call() ); execute( TC_lu_auth_sai_timeout() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 9ea0c76..b80005e 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -56,6 +56,15 @@ vc_conn.done; } +testcase TC_iu_lu_imsi_timeout_tmsi_realloc() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + f_vty_config(MSCVTY, "network", "authentication required"); + + vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_tmsi_realloc), 1005, ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_cmserv_imsi_unknown() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -424,6 +433,7 @@ execute( TC_iu_lu_imsi_reject() ); execute( TC_iu_lu_imsi_timeout_gsup() ); execute( TC_iu_lu_imsi_auth3g_tmsi() ); + execute( TC_iu_lu_imsi_timeout_tmsi_realloc() ); execute( TC_iu_cmserv_imsi_unknown() ); execute( TC_iu_lu_and_mo_call() ); execute( TC_iu_lu_auth_sai_timeout() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 96af4a4..f94c781 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -7,6 +7,11 @@ + + Timeout waiting for ClearCommand/Release + MSC_Tests.ttcn:MASKED TC_lu_imsi_timeout_tmsi_realloc testcase + + @@ -126,6 +131,11 @@ + + Timeout waiting for ClearCommand/Release + MSC_Tests_Iu.ttcn:MASKED TC_iu_lu_imsi_timeout_tmsi_realloc testcase + + Tguard timeout MSC_Tests_Iu.ttcn:MASKED MSC_Tests_Iu control part -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 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: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 17:12:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 17:12:06 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/gprs_bssgp_pcu.cpp at 203 PS2, Line 203: to get IMSI %s paging group ... to derive / compute paging group from IMSI-%s -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 01 Jan 2020 17:12:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 20:27:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 20:27:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 ) Change subject: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union ...................................................................... library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union Change-Id: I40c2a3c38799a625836e4c28f476524c92077b83 --- M library/RLCMAC_CSN1_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/16694/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 11df29d..321049c 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -230,6 +230,8 @@ type union PageInfo { PageInfoPs ps, PageInfoCs cs + } with { + variant "TAG(ps, presence = '0'B; cs, presence = '1'B)" }; type record PacketPagingReq { PageMode page_mode, diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d19093c..cd13ff5 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1299,10 +1299,8 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) - because TTCN3 counts length up to octet boundary and thinks it's a - PageInfoPs: */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) { /* TODO: Verify MI contents encoded match */ setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")"); @@ -1351,10 +1349,8 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) - because TTCN3 counts length up to octet boundary and thinks it's a - PageInfoPs: */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + /* FIXME: actually match the identity */ + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 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: I40c2a3c38799a625836e4c28f476524c92077b83 Gerrit-Change-Number: 16694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 21:04:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jan 2020 21:04:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 ) Change subject: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 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: I40c2a3c38799a625836e4c28f476524c92077b83 Gerrit-Change-Number: 16694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jan 2020 21:04:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 21:10:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jan 2020 21:10:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 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: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jan 2020 21:10:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 22:07:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jan 2020 22:07:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 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: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jan 2020 22:07:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 22:19:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 22:19:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... PCU: fix: actually match IMSI in Packet Paging Request Makes the test cases fail because typeOfIdentity != '001'B. Change-Id: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc --- M library/RLCMAC_CSN1_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 31 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/16695/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 321049c..7cb6581 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -17,6 +17,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from MobileL3_GMM_SM_Types all; + import from MobileL3_CommonIE_Types all; /* TS 44.060 11.2.0.1 */ type enumerated RlcmacDlCtrlMsgType { @@ -203,7 +204,7 @@ * use only 4 bit to encode the length of a mobile identity, whereas the IE * uses a byte. */ uint4_t len, - octetstring mobile_id + MobileIdentityV mobile_id } with { variant (len) "LENGTHTO(mobile_id)" }; type record PageInfoPs { BIT1 presence ('0'B), diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index cd13ff5..e4e26cc 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1247,6 +1247,29 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } +private function f_pkt_paging_match_imsi(in PacketPagingReq req, hexstring imsi) { + var MobileIdentityLV_Paging mi := req.repeated_pageinfo.cs.mobile_identity; + var integer mi_len := lengthof(imsi); + + /* Convert number of digits to the number of octets */ + mi_len := mi_len / 2 + (mi_len rem 2); + + if (mi.len != mi_len) { + setverdict(fail, "Mobile Identity length mismatch: ", + mi.len, " vs ", mi_len); + mtc.stop; + } else if (mi.mobile_id.typeOfIdentity != '001'B) { + setverdict(fail, "Mobile Identity must be of type IMSI ('001'B), ", + "got: ", mi.mobile_id.typeOfIdentity); + mtc.stop; + } else if (mi.mobile_id.oddEvenInd_identity.imsi.digits != imsi) { + setverdict(fail, "Mobile Identity contains unexpected IMSI, ", + "expected ", imsi, " got: ", + mi.mobile_id.oddEvenInd_identity.imsi.digits); + mtc.stop; + } +} + /* Test CS paging over the BTS<->PCU socket. * When a (class B or C, not A) MS has an active TBF (or is on the PDCH), the MS can not react on CS paging over CCCH. * Paging should be send on the PACCH. @@ -1263,7 +1286,6 @@ var OCT4 tlli := '00000001'O; var MobileL3_CommonIE_Types.MobileIdentityLV mi; var octetstring mi_enc_lv; - var MobileIdentityLV_Paging mi_res; var hexstring imsi := f_gen_imsi(42); /* Initialize NS/BSSGP side */ @@ -1300,12 +1322,9 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; - if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) { - /* TODO: Verify MI contents encoded match */ - setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")"); - mtc.stop; - } + /* Make sure that Packet Paging Request contains the same IMSI */ + f_pkt_paging_match_imsi(dl_block.ctrl.payload.u.paging, imsi); + setverdict(pass); } @@ -1317,7 +1336,6 @@ var RlcmacDlBlock dl_block; var boolean ok; var OCT4 tlli := '00000001'O; - var MobileIdentityLV_Paging mi_res; var hexstring imsi := f_gen_imsi(42); /* Initialize NS/BSSGP side */ @@ -1349,8 +1367,9 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: actually match the identity */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; + /* Make sure that Packet Paging Request contains the same IMSI */ + f_pkt_paging_match_imsi(dl_block.ctrl.payload.u.paging, imsi); + setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 1 22:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 1 Jan 2020 22:24:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 1: Also, Wireshark is not smart enough to dissect IMSI in Packet Paging Request: GSM RLC/MAC: PACKET_PAGING_REQUEST (34) (Downlink) 01.. .... = Payload Type (DL): RLC/MAC block contains an RLC/MAC control block that does not include the optional octets of the RLC/MAC control header (1) ..00 .... = RRBP: Reserved Block: (N+13) mod 2715648 (0) .... 0... = S/P: RRBP field is not valid .... .000 = USF: 0 PACKET_PAGING_REQUEST (34) (downlink) 1000 10.. = MESSAGE_TYPE (DL): PACKET_PAGING_REQUEST (34) .... ..00 = PAGE_MODE: Normal Paging (0) 0... .... = Exist_PERSISTENCE_LEVEL: 0 .0.. .... = Exist_NLN: 0 ..1. .... = Repeated_Page_info Exist: 1 Repeated_Page_info ...1 .... = Repeated_Page_info: (Union) u.Page_req_RR .... 1... = Page_request_for_RR_conn: (Union) u.Mobile_Identity .... .100 0... .... = Length_of_Mobile_Identity_contents: 8 .001 0100 1... .... = Mobile_Identity_contents: 41 .001 0011 0... .... = Mobile_Identity_contents: 38 .001 0010 0... .... = Mobile_Identity_contents: 36 .000 0000 0... .... = Mobile_Identity_contents: 0 .000 0000 0... .... = Mobile_Identity_contents: 0 .000 0000 0... .... = Mobile_Identity_contents: 0 .000 0000 0... .... = Mobile_Identity_contents: 0 .001 0010 0... .... = Mobile_Identity_contents: 36 .00. .... = CHANNEL_NEEDED: 0 ...0 .... = Exist_eMLPP_PRIORITY: 0 Padding Bits .... .000 0000 0000 0000 0000 0000 0000 = Padding: 0 0000 0000 0000 0000 0000 0000 0000 0000 = Padding: 0 0000 0000 0000 0000 0000 0000 0000 0000 = Padding: 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jan 2020 22:24:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 12:05:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 12:05:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG at 9 PS1, Line 9: Makes the test cases fail because typeOfIdentity != '001'B. What do you mean here? That there's a bug in osmo-pcu? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1/pcu/PCU_Tests_RAW.ttcn at 1252 PS1, Line 1252: var integer mi_len := lengthof(imsi); may be clearer defining this as imsi_len and later on: mi_size := imsi_len / 2 + ... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jan 2020 12:05:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 12:08:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 12:08:55 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/pcu_l1_if.cpp at 82 PS2, Line 82: 0 > shouldn't this be 'return pgroup' ? If it is as broken as I suspect, I'm wondering what kind of tes [?] Indeed, I forgot that paging group content is not being yet verified in the TTCN3 test, will add those bits to make sure it is checked. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 02 Jan 2020 12:08:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 13:40:09 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jan 2020 13:40:09 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15888 to look at the new patch set (#6). Change subject: l1sap: add measurement related struct members ...................................................................... l1sap: add measurement related struct members In order to dissolve info_meas_ind_param in ph_data_param and ph_tch_param we need to add the measurement related struct members to ph_data_param and ph_tch_param as well so that those indications can also carry measurement data. Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Related: OS#2977 --- M TODO-RELEASE M include/osmocom/gsm/l1sap.h 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/15888/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 13:44:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 13:44:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... pcu: Check received IMSI suffix from PCUIF paging request Change-Id: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/16696/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d19093c..6f59829 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -366,13 +366,19 @@ } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ -private function f_pcuif_rx_pch_pag_req1(out GsmRrMessage rr_pag_req1) +private function f_pcuif_rx_pch_pag_req1(out integer imsi_suff_rx, out GsmRrMessage rr_pag_req1) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; + var octetstring imsi_suff_octstr; var octetstring macblock; BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; - /* First 3 bytes contain paging group: */ + /* First 3 bytes contain IMSI suffix to calculate paging group: */ + imsi_suff_octstr := substr(pcu_msg.u.data_req.data, 0, 3); + imsi_suff_rx := str2int(oct2char(imsi_suff_octstr[0])) * 100 + + str2int(oct2char(imsi_suff_octstr[1])) * 10 + + str2int(oct2char(imsi_suff_octstr[2])); + macblock := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); rr_pag_req1 := dec_GsmRrMessage(macblock); if (not match(rr_pag_req1, tr_PAG_REQ1())) { @@ -1371,7 +1377,9 @@ private function f_tc_paging_ps_from_sgsn(Nsvci bvci) runs on RAW_PCU_Test_CT { var GsmRrMessage rr_pag_req1; var OCT4 tlli := '00000001'O; - var hexstring imsi := f_gen_imsi(42); + var integer imsi_suff_rx; + var integer imsi_suff_tx := 423; + var hexstring imsi := f_gen_imsi(imsi_suff_tx); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1387,7 +1395,12 @@ BSSGP[0].send(ts_BSSGP_PS_PAGING_IMSI(bvci, imsi)); /* Receive it on BTS side towards MS */ - f_pcuif_rx_pch_pag_req1(rr_pag_req1); + f_pcuif_rx_pch_pag_req1(imsi_suff_rx, rr_pag_req1); + if (imsi_suff_rx != imsi_suff_tx) { + log("Wrong IMSI suffix: expected ", imsi_suff_tx, " but received ", imsi_suff_rx); + setverdict(fail); + mtc.stop; + } setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 13:46:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 13:46:13 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 to look at the new patch set (#3). Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Pass paging group instead of imsi where later is not needed Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h M src/tbf.cpp M src/tbf_dl.cpp 9 files changed, 53 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/16672/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 13:52:11 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jan 2020 13:52:11 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members ...................................................................... Patch Set 5: > Patch Set 5: > > ping? this has been pending for about a month now. There's still the very suspicious union in there... I tried to investigate what this union is about, I can't find any good reason why it has to be there. No code seems to access ta_offs_qbits. According to git you have added this union some time ago with change Ibb58113c2819fe2d6d23ecbcfb8b3fce4055025d. The idea behind this was to keep ABI compatibility. However, I have now removed the union and kept the struct member ta_offs_256bits. I would suggest to do the same with the unions in struct info_meas_ind_param and struct ph_data_param. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 02 Jan 2020 13:52:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 15:23:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 15:23:04 +0000 Subject: Change in libosmocore[master]: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16697 ) Change subject: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed ...................................................................... logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc --- M src/vty/logging_vty.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/16697/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6d908d9..c51b437 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -351,18 +351,18 @@ int category = log_parse_category(argv[0]); int level = log_parse_level(argv[1]); - ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); - if (level < 0) { vty_out(vty, "Invalid level `%s'%s", argv[1], VTY_NEWLINE); - RET_WITH_UNLOCK(CMD_WARNING); + return CMD_WARNING; } if (category < 0) { vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE); - RET_WITH_UNLOCK(CMD_WARNING); + return CMD_WARNING; } + ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); + tgt->categories[category].enabled = 1; tgt->categories[category].loglevel = level; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc Gerrit-Change-Number: 16697 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 15:56:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 15:56:05 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 to look at the new patch set (#3). Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... uhd: Use DEVDRV log category and support UHD >=3.11 logging framework Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 --- M CommonLibs/Logger.h M Transceiver52M/device/uhd/UHDDevice.cpp 2 files changed, 51 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/65/16665/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 15:56:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 15:56:06 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Make logging category DLMS generic and reusable for other backends Make sure old configs using "logging level lms " are still accepted. Initialization order of VTY componenets need to be resorted since newly introduced command requires logging VTY node to be already setup beforehand. Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e --- M CommonLibs/debug.c M CommonLibs/debug.h M CommonLibs/trx_vty.c M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/osmo-trx.cpp 5 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/98/16698/1 diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index cc5be44..c227435 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -65,9 +65,9 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_INFO, }, - [DLMS] = { - .name = "DLMS", - .description = "Logging from within LimeSuite itself", + [DDEVDRV] = { + .name = "DDEVDRV", + .description = "Logging from external device driver library implementing lower level specifics", .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 3837329..0dca2ee 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -15,7 +15,7 @@ DTRXDDL, DTRXDUL, DDEV, - DLMS, + DDEVDRV, }; #define CLOGC(category, level, fmt, args...) do { \ diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 02d6572..3519788 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -528,6 +528,18 @@ return CMD_SUCCESS; } +#define OBSOLETE_MSG "Obsolete\n" +DEFUN_DEPRECATED(log_level_lms, log_level_lms_cmd, + "logging level lms (debug|info|notice|error|fatal)", + ".HIDDEN\n" OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG + OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG OBSOLETE_MSG) +{ + vty_out(vty, "%% 'logging level lms' is now called 'logging level devdrv'" + ", please update your config %s", VTY_NEWLINE); + + return CMD_SUCCESS; +} + static int dummy_config_write(struct vty *v) { return CMD_SUCCESS; @@ -704,6 +716,8 @@ install_element(CONFIG_NODE, &cfg_trx_cmd); + install_element(CFG_LOG_NODE, &log_level_lms_cmd); + install_node(&trx_node, config_write_trx); install_element(TRX_NODE, &cfg_bind_ip_cmd); install_element(TRX_NODE, &cfg_remote_ip_cmd); diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b5993b8..19fe6e8 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -93,7 +93,7 @@ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) lvl = ARRAY_SIZE(lvl_map)-1; - LOGLV(DLMS, lvl_map[lvl]) << msg; + LOGLV(DDEVDRV, lvl_map[lvl]) << msg; } static void print_range(const char* name, lms_range_t *range) diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 16047a9..0ad60ef 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -588,10 +588,10 @@ log_enable_multithread(); osmo_stats_init(tall_trx_ctx); vty_init(&g_vty_info); + logging_vty_add_cmds(); ctrl_vty_init(tall_trx_ctx); trx_vty_init(g_trx_ctx); - logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 15:56:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 15:56:06 +0000 Subject: Change in osmo-trx[master]: doc: Update vty reference xml file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16699 ) Change subject: doc: Update vty reference xml file ...................................................................... doc: Update vty reference xml file Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 --- M doc/manuals/vty/trx_vty_reference.xml 1 file changed, 135 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/99/16699/1 diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index 8738235..ff44078 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -18,10 +18,11 @@ - + + @@ -96,12 +97,6 @@ - - - - - - @@ -193,14 +188,17 @@ - + + + + - + @@ -259,6 +257,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,6 +307,12 @@ + + + + + + @@ -415,12 +456,6 @@ - - - - - - @@ -512,14 +547,17 @@ - + + + + - + @@ -578,6 +616,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -591,6 +666,12 @@ + + + + + + @@ -772,16 +853,6 @@ - - - - - - - - - - @@ -861,6 +932,16 @@ + + + + + + + + + + @@ -973,14 +1054,17 @@ - + + + + - + @@ -1179,20 +1263,6 @@ - - - - - - - - - - - - - - @@ -1247,10 +1317,29 @@ - + - - + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 Gerrit-Change-Number: 16699 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 16:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jan 2020 16:08:33 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16698/1/CommonLibs/trx_vty.c File CommonLibs/trx_vty.c: https://gerrit.osmocom.org/c/osmo-trx/+/16698/1/CommonLibs/trx_vty.c at 532 PS1, Line 532: DEFUN_DEPRECATED I think you could do the deprecation like that: logging_vty_add_deprecated_subsys(trx, "lms"); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 02 Jan 2020 16:08:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 16:11:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 16:11:37 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16698/1/CommonLibs/trx_vty.c File CommonLibs/trx_vty.c: https://gerrit.osmocom.org/c/osmo-trx/+/16698/1/CommonLibs/trx_vty.c at 532 PS1, Line 532: DEFUN_DEPRECATED > I think you could do the deprecation like that: [?] Indeed, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 02 Jan 2020 16:11:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 16:16:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jan 2020 16:16:48 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16665/3/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16665/3/Transceiver52M/device/uhd/UHDDevice.cpp at 143 PS3, Line 143: switch(info.verbosity) Coding style: this is not a function call, so "switch_(...)_{". -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 02 Jan 2020 16:16:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 16:19:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 16:19:16 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 to look at the new patch set (#2). Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Make logging category DLMS generic and reusable for other backends Make sure old configs using "logging level lms " are still accepted. Initialization order of VTY componenets need to be resorted since newly introduced command requires logging VTY node to be already setup beforehand. Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e --- M CommonLibs/debug.c M CommonLibs/debug.h M CommonLibs/trx_vty.c M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/osmo-trx.cpp 5 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/98/16698/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 16:19:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 16:19:16 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 to look at the new patch set (#4). Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... uhd: Use DEVDRV log category and support UHD >=3.11 logging framework Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 --- M CommonLibs/Logger.h M Transceiver52M/device/uhd/UHDDevice.cpp 2 files changed, 51 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/65/16665/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 17:28:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jan 2020 17:28:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 1: (1 comment) Let's keep this change WIP for now. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG at 9 PS1, Line 9: Makes the test cases fail because typeOfIdentity != '001'B. > What do you mean here? That there's a bug in osmo-pcu? Well, I am not sure whether it's my fault (field order mismatch?) or a bug in OsmoPCU :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jan 2020 17:28:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 17:47:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 17:47:36 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16700 ) Change subject: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac ...................................................................... osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac Remove brackets and check for "(" after PKG_CHECK_MODULES to avoid getting comments containing the keyword. Change-Id: Ie2b9a65d42615aa3cce6906ddd53758bc3052942 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/16700/1 diff --git a/osmo-release.sh b/osmo-release.sh index 916af84..31cd1a0 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -29,7 +29,7 @@ else configureac_file="configure.ac" fi - configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + configureac_list=$(grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g") echo "$configureac_list" | \ { return_error=0 while read -r dep ver; do -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2b9a65d42615aa3cce6906ddd53758bc3052942 Gerrit-Change-Number: 16700 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 17:47:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 17:47:36 +0000 Subject: Change in libosmocore[master]: Drop empty file debian/patches/series References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16701 ) Change subject: Drop empty file debian/patches/series ...................................................................... Drop empty file debian/patches/series Change-Id: I1a4aa5d6785aa7ff7dc454930a84d73fe1114726 --- D debian/patches/series 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/16701/1 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29..0000000 --- a/debian/patches/series +++ /dev/null -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1a4aa5d6785aa7ff7dc454930a84d73fe1114726 Gerrit-Change-Number: 16701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 17:47:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 17:47:37 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E108-c6a8-dirty_=E2=86=92_1=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16702 ) Change subject: Bump version: 1.2.0.108-c6a8-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.108-c6a8-dirty ? 1.3.0 Change-Id: I5698bfe45467a8b0e44549105aaf27b8da500de8 --- M TODO-RELEASE M debian/changelog M src/Makefile.am M src/codec/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 8 files changed, 140 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/16702/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index be858ae..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,11 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -core osmo_tdef_get() change val_if_not_present arg from unsigned long to long to allow passing -1 -core struct osmo_tdef fields min_val,max_val added, ABI break (arrays of structs used in programs) -gsm API added osmo_gsm48_rfpowercap2powerclass() -gb API added bssgp_bvc_ctx_free() -core osmo_sockaddr_str_from_32n(), - osmo_sockaddr_str_to_32n() Deprecate: named 'n' but use host byte order. -core osmo_sockaddr_str_from_32h(), - osmo_sockaddr_str_to_32h() New, use host byte order and are named appropriately. diff --git a/debian/changelog b/debian/changelog index 0e28089..3a9e2b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,137 @@ +libosmocore (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-release.sh: Add DRY_RUN mode + * osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION + * osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control + * osmo-release.sh: Check patches under debian/patches apply + * osmo-release.sh: Support releasing openbsc.git + * vty: Register logp cmd next to logging commands + * tdef: Introduce API osmo_tdef_set() + * tdef_vty.h: Add missing header dependencies + * logging_internal.h: Fix osmo_log_info definition + * osmo-release.sh: update TODO-RELEASE for non-lib projects too + * logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h + * msgb: Allow size==headroom in msgb_alloc_headroom*() + * tdef: Introduce min_val and max_val fields + * tdef_test: verify case where osmo_tdef_set returns -EEXIST + * vty: Optionally Set/replace cfg file during cmd 'write file' + * logging: Introduce mutex API to manage log_target in multi-thread envs + * socket.c: Move glibc workarounds to same place in addrinfo_helper() + * vty: Fix go_parent_cb not called for indented nodes at end of cfg file + * tdef: Return correct snprintf value for osmo_tdef_range_str_buf() + * socket: Introduce API osmo_sock_init2_multiaddr() + * socket: Remove unneeded condition check in osmo_sock_init2_multiaddr() + * libosmocore.pc.in: Append -lsctp to Libs.private + * socket.c: build multiaddr socket API helpers only if used by public APIs + * configure: Introduce --disable-libsctp and error by default if libsctp not found + * vty: Return error if cmd returns CMD_WARNING while reading cfg file + * cosmetic: gsm_04_08.h: Fix trailing whitespace + * gsm_04_08.h: Introduce API osmo_gsm48_rfpowercap2powerclass() + * gsm: Fix compilation error under some compilers + * gsm: gsm_utils: Fix return type of API ms_class_gmsk_dbm() and add unit tests + * gsm: gsm_04_08.h: Allow accessing classmark2 as struct instead of uint32_t + * Introduce fields related to DTAP DLCI + * osmo-release.sh: Use set -e before applying changes to prepare release + * osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac + * Drop empty file debian/patches/series + + [ Harald Welte ] + * codec/ecu_fr: Mark input TCH frame as 'const' as we only read it + * context: Add support for [per-thread] global talloc contexts + * cbsp: Fix endless loop iteration when decoding cell list IEs + * cbsp: Remove printf() statement from early development/debugging + * cbsp: Fix decoding of WRITE-REPLACE payload + * codec/ecu: Introduce new generic Error Concealment Unit abstraction + * gsm_08_58: Add vendor-specific Message Type for ETWS Primary Warning + * Introduce BTS_FEAT_ETWS_PN for communicating ETWS PN capability + * sim/class_tables: Fix typo in comment + * cosmetic: clarify c_iflag in osmo_serial_init() + * select: Make file descriptor lists per-thread + * 04.80: Deprecate gsm0480_create_ussd_resp() + * Check for osmo_fsm_register() error return value + * gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller + * osmo-arfcn: Fix '-h' option + * utils: exit(2) on unsupported positional arguments on command line + * gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE + * gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" + * libosmocore libusb integration + * usb: Import a variety of libusb utility functions from simtrace + * debian/control: Add missing libusb-1.0-0-dev dependency + * Introduce helper functions for safe fork+exec of processes + + [ Neels Hofmeyr ] + * add vty logp command to echo on all log targets + * osmo_tdef_get(): allow passing -1 as default timeout + * fix: vty crash by logging during VTY_CLOSED event handling + * OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition + * OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer + * tdef: fixup osmo_tdef_set() + * gsup: add OSMO_GSUP_SUPPORTED_RAT_TYPES_IE and OSMO_GSUP_CURRENT_RAT_TYPE_IE + * API doc tweaks (mncc.h, gsm_08_08.h) + * add osmo_fsm_set_dealloc_ctx(), to help with use-after-free + * fsm: refuse state chg and events after term + * add osmo_sockaddr_str_is_nonzero() + * test: add OSMO_SOCKADDR_STR_FMT to sockaddr_str_test.c + * fix OSMO_SOCKADDR_STR_FMT for IPv6 + * add osmo_sockaddr_str_cmp() + * utils.c: fix various inaccurate API doc about return values + * logging.h: define ansi color constants + * fix DLSMS logging category color: '[1:38m' isn't actually defined + * cosmetic: logging.h: fix comment s/levels/subsystems + * osmo_sockaddr_str: API doc: fix 32bit addr mixup of host/network byte order + * utils.h: add OSMO_NAME_C_IMPL() macro + * fix osmo_escape_str_c() and osmo_quote_str_c() + * GSUP: rename E_ROUTING_ERROR to ROUTING_ERROR + * fsm.h: add missing include of logging.h + * msgb_put: more elaborate logging of head/tailroom failure + * utils_test: add osmo_print_n_test() + * utils: add osmo_strnchr() + * osmo_sockaddr_str: deprecate osmo_sockaddr_str_*_32n() + * vty: track parent nodes also for telnet sessions + * vty_app_info.is_config_node: add OSMO_DEPRECATED + * add osmo_escape_cstr and osmo_quote_cstr + * add all missing OSMO_GSUP_TO_MSGT_*() macros + + [ Oliver Smith ] + * Cosmetic: l1sap.h: change /* !< to /*!< + * logging.h: add L1 SAPI related context and filter + * gprs_ns_vty: return success for disabled FR/GRE + * debian, utils: switch to python 3 + + [ Ruben Undheim ] + * MAXPATHLEN set if not defined + * No fail if no /proc/cpuinfo + + [ Philipp Maier ] + * cosmetic: Move comment to the right place + * cosmetic: Add comment on GSM-FR ECU struct + * ecu_fr: increase test coverage for FR ECU implementation + * gsm0508: add functions to calculate beginning of a block + + [ Vadim Yanitskiy ] + * gsm29205_test: fix error: missing braces around initializer + * GPRS/BSSGP: introduce bssgp_bvc_ctx_free() + * logging/vty: do not print deprecated logging commands to stdout + * logging/vty: use LOG_LEVEL_ARGS in logging_vty_add_deprecated_subsys() + * logging/vty: fix: actually ignore deprecated logging commands + * logging/vty: fix vty_read_file(): do not write warnings to stdin + * logging/vty: fix: do not close stderr in vty_close() + * libosmovty: properly initialize vty->fd in vty_new() + * libosmovty: simplify condition checking vty->fd in vty_close() + * core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE + + [ Daniel Willmann ] + * libosmogsm: add support for XOR authentication + + [ Vasil Velichkov ] + * Add code coverage support + + [ Eric Wild ] + * sim: allow opening reader# > 0 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 18:42:29 +0100 + libosmocore (1.2.0) unstable; urgency=medium [ Harald Welte ] diff --git a/src/Makefile.am b/src/Makefile.am index eeb3f7d..34cda0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=14:0:2 +LIBVERSION=15:0:3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index c9d7a22..ac33aa0 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:1:1 +LIBVERSION=2:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index e14c11c..7248413 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=9:1:0 +LIBVERSION=10:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4a1faca..6935eab 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=13:0:0 +LIBVERSION=14:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 1a8e508..c608757 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:1:1 +LIBVERSION=1:2:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index abed92a..35350cc 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=8:0:4 +LIBVERSION=8:1:4 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5698bfe45467a8b0e44549105aaf27b8da500de8 Gerrit-Change-Number: 16702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 19:10:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 19:10:11 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E16-293b_=E2=86=92_0=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 ) Change subject: Bump version: 0.2.0.16-293b ? 0.3.0 ...................................................................... Bump version: 0.2.0.16-293b ? 0.3.0 Change-Id: I6b04b483912fe16333b7737af7652329c52f6646 --- M debian/changelog 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/16703/1 diff --git a/debian/changelog b/debian/changelog index 4b35c12..ad5a9c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +osmo-gsm-manuals-dev (0.3.0) unstable; urgency=medium + + [ Oliver Smith ] + * tests/Makefile.am: always put glossary at the end + * Cosmetic: fix Makefile.vty.reference.inc example + * Support multiple VTY reference manuals + * tests: add second VTY reference + * Drop python2 and pychart dependencies + * debian/check-depends.sh: add inkscape to depends + + [ Pau Espin Pedrol ] + * sigtran-osmocom.adoc: Fix typos + * Fix python-nwdiag dependency on new debian distros + * trx_if.adoc: Fix typo and formatting of bullet list + + [ Martin Hauke ] + * Fix some typos + + [ Harald Welte ] + * typo / stylistic fixes by Tom Tessier + * missing glossary items; mostly MSC/3G related + * some more missing items from glossary. + * gsup: Fix description of Purge MS procedure + * Add GPRS + + [ Neels Hofmeyr ] + * D-GSM biblio entries + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:09:35 +0100 + osmo-gsm-manuals-dev (0.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6b04b483912fe16333b7737af7652329c52f6646 Gerrit-Change-Number: 16703 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 19:25:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 19:25:07 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E4-7aa6_=E2=86=92_0=2E1=2E2?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16704 ) Change subject: Bump version: 0.1.1.4-7aa6 ? 0.1.2 ...................................................................... Bump version: 0.1.1.4-7aa6 ? 0.1.2 Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/04/16704/1 diff --git a/debian/changelog b/debian/changelog index 168df55..14a0d0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-pcap (0.1.2) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: README.md: fix typo + * osmoappdesc.py: fix paths to configs + * Cosmetic: README.md: document how to run tests + * osmoappdesc.py: switch to python 3 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:19:28 +0100 + osmo-pcap (0.1.1) unstable; urgency=medium * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55 Gerrit-Change-Number: 16704 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 19:40:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 19:40:50 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E32-bd8f-dirty_=E2=86=92_1=2E5=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 ) Change subject: Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp6.install M debian/rules M gtp/Makefile.am 6 files changed, 50 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/05/16705/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 73e3189..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp queue.h struct qmsg_t got a new field: entry -libgtp pdp.h struct pdp_t got a new field: qmsg_list_req diff --git a/debian/changelog b/debian/changelog index 921875a..6b8a313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +osmo-ggsn (1.5.0) unstable; urgency=medium + + [ Jan Engelhardt ] + * build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST + + [ Pau Espin Pedrol ] + * libgtp: Remove packets in tx queue belonging pdp being freed + * libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected + * Introduce in46a_is_v{4,6}() helpers + * ggsn: Move PCO handling code into its own file + * in46_addr: Improve in46a_ntop documentation + * ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas + * ggsn: Split application lifecycle related code into ggsn_main.c + * Move pdp_get_peer_ipv() to lib/util.* + * gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas + * Introduce LOGTUN log helper + * ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs + * pdp: constify param in pdp_count_secondary() + * ggsn_vty.c: Improve output of VTY show pdp-context + * doc: Update vty reference xml file + * libgtp: Introduce cb_recovery3 + * ggsn: Implement echo req/resp and recovery + * cosmetic: fix formatting in if line + * gtp: Log msg retransmits and timeouts + * cosmetic: gtp: Drop commented out code calling pdp_freepdp() + * cosmetic: gtp: Improve documentation of gtp_delete_context_req2() + * ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() + * gtp: Manage queue timers internally + * ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs + + [ Vadim Yanitskiy ] + * gtp_update_pdp_ind(): fix NULL-pointer dereference + * gtp_error_ind_conf(): fix: guard against an unknown GTP version + * gtp/gtp.c: cosmetic: use get_tid() where we need TID + * manuals/configuration.adoc: fix Network Address without prefix length + * manuals/configuration.adoc: fix IPv4 address mismatch in <> + * contrib/systemd: add systemd-networkd examples from manuals + + [ Harald Welte ] + * sgsnemu: Fix null-pointer format string argument + * manual: Fix copy+paste error + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:39:39 +0100 + osmo-ggsn (1.4.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 9a5ed58..a07bdca 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp5 +Package: libgtp6 Architecture: any Multi-Arch: same Section: libs @@ -42,7 +42,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp5 (= ${binary:Version}) + libgtp6 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -55,7 +55,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp6 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -66,7 +66,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp6 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp5.install b/debian/libgtp6.install similarity index 100% rename from debian/libgtp5.install rename to debian/libgtp6.install diff --git a/debian/rules b/debian/rules index cdb2480..c5c7708 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp5 --dbg-package=libgtp-dbg + dh_strip -plibgtp6 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 20255f7..a392277 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=5:0:0 +LIBVERSION=6:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 Gerrit-Change-Number: 16705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 19:54:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 19:54:33 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E8-4c2c-dirty_=E2=86=92_0=2E8=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16706 ) Change subject: Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 ...................................................................... Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 --- M TODO-RELEASE M debian/changelog M src/Makefile.am 3 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/06/16706/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 4fe42c6..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-abis struct ipa_client_conn Fields added at the end (no ABI break because instance is created through API func) -libosmo-abis ipa_client_conn_create2() New API added diff --git a/debian/changelog b/debian/changelog index db17338..68064ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libosmo-abis (0.8.0) unstable; urgency=medium + + [ Alexander Couzens ] + * ipa: ipa_server_link_close() add checks of link state + + [ Pau Espin Pedrol ] + * ipa: Allow setting local addr and port for struct ipa_client_conn + + [ Harald Welte ] + * dahdi: Use ioctl(DAHDI_SPECIFY) instead of legacy /dev/dahdi/%u + * Enable DAHDI support by default; require --disable-dahdi otherwise + + [ Vadim Yanitskiy ] + * input/ipaccess.c: propagate errors from ipa_parse_unitid() + * input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET + * e1_input.c: make reference counting get() / put() more verbose + * input/ipa_keepalive.c: make sure IPA keepalive FSM is registered + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:53:32 +0100 + libosmo-abis (0.7.0) unstable; urgency=medium [ Max ] diff --git a/src/Makefile.am b/src/Makefile.am index 9c438c9..5ae94e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=7:0:1 +ABIS_LIBVERSION=8:0:2 TRAU_LIBVERSION=4:0:2 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 Gerrit-Change-Number: 16706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 20:03:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 20:03:57 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E16-6413a-dirty_=E2=86=92_0=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16707 ) Change subject: Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 ...................................................................... Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control M src/Makefile.am 5 files changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/07/16707/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b7cb070..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif stream osmo_sock_init2_multiaddr() is used, requires libosmocore > 1.2.0 (to be released) diff --git a/configure.ac b/configure.ac index 66ec57f..7af10ec 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,8 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) diff --git a/debian/changelog b/debian/changelog index b3aba59..c4f664b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +libosmo-netif (0.7.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * stream: Introduce API osmo_stream_cli_is_connected + * stream: Fix scheduling of queued messages during connecting state + * stream_test: Use fake time + * stream_test: Log fake time + * osmux: osmux_snprintf(): Append comma between osmux frames in msg + * osmux: osmux_snprintf(): Remove dangling whitespace at the end of dummy frames + * tests: osmux_test: Use fake time also for monotonic clock + * osmux: squash LOGP message to one line + * tests: osmux_test: Provide More accurate logging expectancies + * stream.c: remove duplicated line setting variable + * stream: osmo_stream_srv_link: Support setting multiple addr + * stream: osmo_stream_cli: Support setting multiple addr + * tests: osmux_test: Hardcode h_output values set by random() + * stream: Fix fd param passed to close() in error conditon + * libosmo-netif.pc.in: Append -lsctp to Libs.private + + [ Neels Hofmeyr ] + * osmux_test: don't use color logging + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:01:22 +0100 + libosmo-netif (0.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index e1b2096..6cec7e5 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ libdpkg-perl, git, doxygen, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.3.0), libosmo-abis-dev (>= 0.6.0), pkg-config, libpcap0.8-dev, diff --git a/src/Makefile.am b/src/Makefile.am index 7acbd79..64fd1d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=8:0:0 +LIBVERSION=9:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 Gerrit-Change-Number: 16707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 20:05:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 20:05:52 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E16-6413a-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16707 ) Change subject: Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 ...................................................................... Patch Set 1: Expected failure due to new libosmocore just realized required. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 Gerrit-Change-Number: 16707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jan 2020 20:05:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 20:24:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 20:24:34 +0000 Subject: Change in libosmo-sccp[master]: debian: Drop patches directory containing old patch not longer required References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 ) Change subject: debian: Drop patches directory containing old patch not longer required ...................................................................... debian: Drop patches directory containing old patch not longer required Change-Id: I8e518a28cc54f42ff3e7e9205eefbce3a1d67d9d --- D debian/patches/debian-changes-0.0.2-1 D debian/patches/series 2 files changed, 0 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/08/16708/1 diff --git a/debian/patches/debian-changes-0.0.2-1 b/debian/patches/debian-changes-0.0.2-1 deleted file mode 100644 index ed4a4df..0000000 --- a/debian/patches/debian-changes-0.0.2-1 +++ /dev/null @@ -1,29 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - libosmo-sccp (0.0.2-1) unstable; urgency=low - . - * Initial release (Closes: #nnnn) - . - The person named in the Author field signed this changelog entry. -Author: Harald Welte - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ libosmo-sccp-0.0.2/.version -@@ -0,0 +1 @@ -+0.0.2 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a3659e3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes-0.0.2-1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8e518a28cc54f42ff3e7e9205eefbce3a1d67d9d Gerrit-Change-Number: 16708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 20:24:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 20:24:34 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E71-bb75-dirty_=E2=86=92_1=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 ) Change subject: Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-sigtran5.install M debian/rules M src/Makefile.am 7 files changed, 101 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/09/16709/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 37a636e..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-sigtran osmo_ss7_asp_peer ABI breakage (host is now an array of strings) -libosmo-sigtran osmo_ss7_as ABI breakage (added field last_asp_idx_sent) -libosmo-sigtran osmo_ss7_as ABI breakage (added field mode_set_by_vty) diff --git a/configure.ac b/configure.ac index 25ff832..11b5fe8 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 5fb9cb0..2b14542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,91 @@ +libosmo-sccp (1.2.0) unstable; urgency=medium + + [ Kira Obrezkova ] + * systemd: This patch adds Documentation field to the systemd service file + + [ Alexander Couzens ] + * osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 + * sccp_user: correct comment for osmo_sccp_simple_client + + [ Pau Espin Pedrol ] + * ss7: Do not queue messages if stream is not connected + * Fix typo in log message of recent commit + * m3ua: Log incorrect selected AS + * Defer xua server binding until exit of VTY node + * ss7: Support multiple addresses in SCTP connections + * ss7: Log local and remote address set upon ASP restart + * tests: Introduce test for multi-homing STP features + * cosmetic: ss7: Fix trailing whitespace + * vty: Fix write-config of local-ip and remote-ip commands + * cosmetic: Fix trailing whitespace + * ss7: Fix osmo_ss7_asp_peer_snprintf() output if peer has zero IP addr assigned + * ss7: Fix finding asp by socket addr if local ip addr is 0.0.0.0 + * ss7: Fix finding asp by socket addr if it has no remote hosts configured + * vty: ss7: Make sure ASP has at least INET_ANY addr set if not configured in VTY + * vty: Print traffic mode during show cs7 instance as + * ss7: Set default traffic-mode to override + * ss7: Implement AS traffic mode loadshare using round robin ASP selection + * ss7: Set configured AS traffic mode when sending Routing Key Register msg + * ss7: Only override traffic mode from recv REG REQ if not set by VTY + * xua: Verify all route ctxs received in ASPAC msg + * ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if known + * xua: Allow traffic mode set by peer if not set by VTY + * xua: Fix private function name + * xua: loadshare: select ASP for tx only if active + * xua: Reset AS traffic mode set by peer during shutdown + * xua: Select only active ASPs during tx in Override traffic mode + * xua: On new ASPAC, set and notify other ASPs as inactive + * ss7: Set ASP default remote addr to 127.0.0.1 if none set in VTY + * xua: Don't send NOTIFY messages to IPA ASPs + * xua: ipa_asp_fsm: Allow moving ASP to inactive state + * xua: ipa_asp_fsm: Allow receiving IPA ID ACK before IPA ID RESP + * ss7: Improve log formatting during ASP restart + * ss7: Set correct local addr and port during dynamic ASP creation + * xua: Avoid multiline log in xua_msg_dump() + * xua: Implement traffic mode broadcast + * debian: Drop patches directory containing old patch not longer required + + [ Harald Welte ] + * Move definition of LOGSS7() to header file; add LOGPAS() like LOGPASP() + * Use LOGPAS / LOGPASP in favor of generic LOGSS7 where applicable + * ipa: Don't send non-SCCP data over IPA/SCCPlite + * ipa: Fix crash when parsing of received IPA SCCP message fails + * ipa: VTY config option to explicitly enable/disable SCCP patching + * Don't permit routing-context != 0 for IPA peers + * cosmetic: Document why IPA uses hard-coded routing-context 0 + * Log correct protocol during xua_accept_cb() + * xua_rkm: Print NOTICE log message if registration for wrong rctx + * xua_rkm: Don't permit de-registration of rctx with ASP active + * xua_asp_fsm: Don't send M3UA ERR and then send ASPAC_ACK + * M3UA: Reject ASP activation + RKM registration for incompatible traffic-mode + * introduce public enum osmo_ss7_asp_role for ASP/SG/IPSP + * Allow ASP role to be configured + * vty: Permit configuration of ASPs in SCTP client mode + * Don't forget to store the sctp-role during writing config file + * osmo_ss7: Add osmo_ss7_asp_find() + * asp: Don't override ASP and SCTP role when re-entering asp node + * fix generating asp-role that can be parsed when re-opening config file + * Skip dynamic ASPs when writing the list of ASPs in an AS + * check for osmo_fsm_register() failures and propagate error + * xua_asp_fsm: Ensure xUA client includes traffic-mode if configured + * xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA + * stp: exit(2) on unsupported positional arguments on command line + * ASP FSM: Permit DOWN -> DOWN "transition" + * ASP: Stop re-transmitting un-acknowledged messages on SCTP down event + + [ Vadim Yanitskiy ] + * osmo_ss7.c: cosmetic: fix typo in xua_accept_cb() + * osmo_ss7.c: fix copy-paste error in xua_accept_cb() + * osmo_ss7.c: fix xua_accept_cb(): properly assign role + * tests/sccp/Makefile.am: use sccp.o from $(top_builddir) + * osmo_ss7_vty.c: implement 'active' filter for show_cs7_as_cmd + + [ Oliver Smith ] + * gitignore: add various generated doc files + * osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:24:11 +0100 + libosmo-sccp (1.1.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 3417297..fe622e0 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.3.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev (>= 0.4.0), + libosmo-netif-dev (>= 0.7.0), libsctp-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.7 @@ -34,7 +34,7 @@ . This package contains the development files for the library. -Package: libosmo-sigtran3 +Package: libosmo-sigtran5 Section: libs Architecture: any Multi-Arch: same @@ -53,7 +53,7 @@ Architecture: any Section: debug Multi-Arch: same -Depends: libosmo-sigtran3 (= ${binary:Version}), +Depends: libosmo-sigtran5 (= ${binary:Version}), ${misc:Depends} Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -68,7 +68,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmo-sigtran3 (= ${binary:Version}), + libosmo-sigtran5 (= ${binary:Version}), libjs-jquery Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -83,7 +83,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmo-sigtran3 (= ${binary:Version}), + libosmo-sigtran5 (= ${binary:Version}), libosmocore-dev, libosmo-netif-dev Description: Development headers for the Osmocom SIGTRAN library @@ -98,7 +98,7 @@ Architecture: any Multi-Arch: same Section: net -Depends: libosmo-sigtran3, +Depends: libosmo-sigtran5, ${shlibs:Depends}, ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) diff --git a/debian/libosmo-sigtran3.install b/debian/libosmo-sigtran5.install similarity index 100% rename from debian/libosmo-sigtran3.install rename to debian/libosmo-sigtran5.install diff --git a/debian/rules b/debian/rules index a8eeff5..9c27539 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ dh $@ --with autoreconf override_dh_strip: - dh_strip -plibosmo-sigtran3 --dbg-package=libosmo-sigtran-dbg + dh_strip -plibosmo-sigtran5 --dbg-package=libosmo-sigtran-dbg dh_strip -posmo-stp --dbg-package=osmo-stp-dbg override_dh_install: diff --git a/src/Makefile.am b/src/Makefile.am index bdb225b..4ef753c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=4:0:1 +LIBVERSION=5:0:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 Gerrit-Change-Number: 16709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 20:37:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jan 2020 20:37:44 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E4=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 ) Change subject: Bump version: 1.3.1 ? 1.4.0 ...................................................................... Bump version: 1.3.1 ? 1.4.0 Change-Id: Ia6693372994791bac4ab86808729f5e568dd9176 --- M debian/changelog 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/10/16710/1 diff --git a/debian/changelog b/debian/changelog index bbe3db5..0391941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +osmo-sip-connector (1.4.0) unstable; urgency=medium + + [ Keith ] + * coverity: Address issue found by coverity + + [ Philipp Maier ] + * mncc: check fd before closing a connection + + [ Alexander Couzens ] + * .service: require to ran after network-online.target + * exit if the sip agent failed to start + + [ Oliver Smith ] + * mncc.c: fix gsm_mncc_rtp size checks + * osmoappdesc.py: switch to python 3 + + [ Neels Hofmeyr ] + * MNCC v6: add optional SDP to the socket protocol + * logging from sofia: add missing newline + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:35:01 +0100 + osmo-sip-connector (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia6693372994791bac4ab86808729f5e568dd9176 Gerrit-Change-Number: 16710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 21:42:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jan 2020 21:42:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 1: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695/1//COMMIT_MSG at 9 PS1, Line 9: Makes the test cases fail because typeOfIdentity != '001'B. > Well, I am not sure whether it's my fault (field order mismatch?) or a bug in OsmoPCU :/ I have (manually) verified the contents of Mobile Identity in Packet Paging Request, and it looks just fine. I also prepared a patch for Wireshark (https://code.wireshark.org/review/35625), and that's what I am getting: ACKET_PAGING_REQUEST (34) (downlink) 1000 10.. = MESSAGE_TYPE (DL): PACKET_PAGING_REQUEST (34) .... ..00 = PAGE_MODE: Normal Paging (0) 0... .... = Exist_PERSISTENCE_LEVEL: 0 .0.. .... = Exist_NLN: 0 ..1. .... = Repeated_Page_info Exist: 1 Repeated_Page_info ...1 .... = Repeated_Page_info: (Union) u.Page_req_RR .... 1... = Page_request_for_RR_conn: (Union) u.Mobile_Identity .... .100 0... .... = Length_of_Mobile_Identity_contents: 8 0010 .... = Identity Digit 1: 2 .... 1... = Odd/even indication: Odd number of identity digits .... .001 = Mobile Identity Type: IMSI (1) IMSI: 262420000000042 [Association IMSI: 262420000000042] Mobile Country Code (MCC): Germany (262) Mobile Network Code (MNC): Vodafone GmbH (42) .00. .... = CHANNEL_NEEDED: 0 ...0 .... = Exist_eMLPP_PRIORITY: 0 This must be a problem of TITAN's codec: we're trying to use record MobileIdentityV on non-octet-aligned buffer. Any ideas how to resolve this? mobile_identity := { len := 8, mobile_id := { typeOfIdentity := '010'B, oddEvenInd_identity := { imei := { oddevenIndicator := '1'B, digits := '894900000000090'H } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jan 2020 21:42:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 2 22:53:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jan 2020 22:53:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jan 2020 22:53:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:43:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 11:43:19 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E26-276c-dirty_=E2=86=92_1=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16711 ) Change subject: Bump version: 1.1.0.26-276c-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.26-276c-dirty ? 1.2.0 Change-Id: I5778895237511c62903784e8bed6920ecf058a50 --- M configure.ac M debian/changelog 2 files changed, 46 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16711/1 diff --git a/configure.ac b/configure.ac index d39edb2..334a7e8 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 0b89abe..1b02a20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +osmo-hlr (1.2.0) unstable; urgency=medium + + [ Ruben Undheim ] + * Fix test for return codes on mipsel and alpha archs + + [ Thorsten Alteholz ] + * fix spelling errors detected by lintian + + [ Pau Espin Pedrol ] + * tests: Fix db_test err file to expect error code name instead of value + + [ Oliver Smith ] + * tests/test_nodes.vty: check less libosmocore cmds + * tests/db_upgrade: disable for old sqlite versions + * gitignore: add tests/db_upgrade/*.dump + * gsup_client.h: fix license header: GPLv2+ + * tests/auc: change back to python3 + + [ Neels Hofmeyr ] + * fix double free in osmo_gsup_client_enc_send() + * db upgrade to v2: log version 2, not 1 + * fix upgrade to version 2: imei column default value + * add --db-check option + * hlr.sql: move comment + * add db_upgrade test + * hlr db schema 3: hlr_number -> msc_number + * db.c: code dup: add db_run_statements() for arrays of statements + * move headers to include/osmocom/hlr + * fix upgrade test in presence of ~/.sqliterc + * db upgrade: remove some code dup + * add osmo_gsup_msgb_alloc() + * Makefile convenience: add VTY_TEST var to run only one test + * remove gsup_test + * test_nodes.vty: tweak: add some '?' checks + * db v4: add column last_lu_seen_ps + + [ Harald Welte ] + * AUC: Add support for setting the AMF separation bit to '1' for EUTRAN + * hlr: exit(2) on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 12:37:35 +0100 + osmo-hlr (1.1.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5778895237511c62903784e8bed6920ecf058a50 Gerrit-Change-Number: 16711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:51:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 11:51:44 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 ) Change subject: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo ...................................................................... chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo Change-Id: I7713635e15c1d0680fd8d8c11703683710d9c457 --- M common/chapters/gsup.adoc 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/12/16712/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 2742e0f..511f2b3 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -439,7 +439,7 @@ |08|MSISDN|<>|O|TLV|0-9 |09|HLR Number|<>|O|TLV|0-9 |04|PDP info complete|<>|O|TLV|2 -|05|PDP info|<>|1-10|TLV| +|05|PDP info|<>|O|TLV|1-10 |=== If the PDP info complete IE is present, the old PDP info list shall be cleared. @@ -519,7 +519,7 @@ |08|MSISDN|<>|O|TLV|0-9 |09|HLR Number|<>|O|TLV|0-9 |04|PDP info complete|<>|M|TLV|2 -|05|PDP info|<>|0-10|TLV| +|05|PDP info|<>|C|TLV|0-10 |14|PDP-Charging Characteristics|<>|O|TLV|4 |=== @@ -558,7 +558,7 @@ | |Message Type|<>|M|V|1 |01|IMSI|<>|M|TLV|2-10 |28|CN Domain|<>|O|TLV|3 -|10|PDP context id|<> (no conditional IE)|0-10|TLV| +|10|PDP Context ID|<>|C|TLV|3 |=== ==== Delete Subscriber Data Error -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I7713635e15c1d0680fd8d8c11703683710d9c457 Gerrit-Change-Number: 16712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 11:54:09 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 ) Change subject: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Gerrit-Change-Number: 16654 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 11:54:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:54:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 11:54:39 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 ) Change subject: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I7713635e15c1d0680fd8d8c11703683710d9c457 Gerrit-Change-Number: 16712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 11:54:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:56:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 11:56:24 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 ) Change subject: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding ...................................................................... chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Related: OS#4324 --- M common/chapters/gsup.adoc 1 file changed, 30 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 1c18ae1..2742e0f 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1685,21 +1685,44 @@ |=== |Field|Presence|Length|Description |T|M|1|Identity type -|V|O|...|Encoded identity itself +|V|O|1|ToN/NPI header +|V|O|...|BCD encoded (or alphanumeric) identity |=== where the identity type can be one of the following: .Identity types of SM-RP-DA / SM-RP-OA IEs -[options="header",cols="15%,85%"] +[options="header",cols="15%,15%,70%"] |=== -|Type|Description -|0x01|IMSI (see 3GPP TS 29.002, clause 7.6.2.1) -|0x02|MSISDN (see 3GPP TS 29.002, clause 7.6.2.17) -|0x03|Service centre address (see 3GPP TS 29.002, clause 7.6.2.27) -|0xff|Omit value for noSM-RP-DA and noSM-RP-OA +|Type|ToN/NPI Header|Description +|0x01|No|IMSI (see 3GPP TS 29.002, clause 7.6.2.1) +|0x02|Yes|MSISDN (see 3GPP TS 29.002, clause 7.6.2.17) +|0x03|Yes|Service centre address (see 3GPP TS 29.002, clause 7.6.2.27) +|0xff|No|Omit value for noSM-RP-DA and noSM-RP-OA |=== +Coding of the optional ToN/NPI header, as well as all possible ToN/NPI values, +is described in 3GPP TS 129.002, section 17.7.8 "Common data types", and +can be summarized as follows: + +.ToN/NPI header coding (as per 3GPP TS 129.002, MSB first) +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0: extension + 1-3: nature of address indicator + 4-7: numbering plan indicator +} +---- + +Please note that unlike both <> and <>, where the value +part is encoded as LV (i.e. contains an additional length), an identity in both +<> / <> IEs shall not contain the redundant +length octet. + [[gsup-ie-sm-rp-ui]] ==== SM-RP-UI (SM TPDU) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Gerrit-Change-Number: 16654 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 11:56:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 11:56:25 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 ) Change subject: chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo ...................................................................... chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo Change-Id: I7713635e15c1d0680fd8d8c11703683710d9c457 --- M common/chapters/gsup.adoc 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 2742e0f..511f2b3 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -439,7 +439,7 @@ |08|MSISDN|<>|O|TLV|0-9 |09|HLR Number|<>|O|TLV|0-9 |04|PDP info complete|<>|O|TLV|2 -|05|PDP info|<>|1-10|TLV| +|05|PDP info|<>|O|TLV|1-10 |=== If the PDP info complete IE is present, the old PDP info list shall be cleared. @@ -519,7 +519,7 @@ |08|MSISDN|<>|O|TLV|0-9 |09|HLR Number|<>|O|TLV|0-9 |04|PDP info complete|<>|M|TLV|2 -|05|PDP info|<>|0-10|TLV| +|05|PDP info|<>|C|TLV|0-10 |14|PDP-Charging Characteristics|<>|O|TLV|4 |=== @@ -558,7 +558,7 @@ | |Message Type|<>|M|V|1 |01|IMSI|<>|M|TLV|2-10 |28|CN Domain|<>|O|TLV|3 -|10|PDP context id|<> (no conditional IE)|0-10|TLV| +|10|PDP Context ID|<>|C|TLV|3 |=== ==== Delete Subscriber Data Error -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I7713635e15c1d0680fd8d8c11703683710d9c457 Gerrit-Change-Number: 16712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:01:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:01:08 +0000 Subject: Change in libosmocore[master]: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16697 ) Change subject: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc Gerrit-Change-Number: 16697 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 03 Jan 2020 12:01:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:02:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:02:00 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E18-258b_=E2=86=92_0=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 ) Change subject: Bump version: 0.2.0.18-258b ? 0.3.0 ...................................................................... Bump version: 0.2.0.18-258b ? 0.3.0 Change-Id: I555f20da93d4cad0998d5067b5999a4a253061a7 --- M debian/changelog 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/13/16713/1 diff --git a/debian/changelog b/debian/changelog index 4b35c12..852d8e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +osmo-gsm-manuals-dev (0.3.0) unstable; urgency=medium + + [ Oliver Smith ] + * tests/Makefile.am: always put glossary at the end + * Cosmetic: fix Makefile.vty.reference.inc example + * Support multiple VTY reference manuals + * tests: add second VTY reference + * Drop python2 and pychart dependencies + * debian/check-depends.sh: add inkscape to depends + + [ Pau Espin Pedrol ] + * sigtran-osmocom.adoc: Fix typos + * Fix python-nwdiag dependency on new debian distros + * trx_if.adoc: Fix typo and formatting of bullet list + + [ Martin Hauke ] + * Fix some typos + + [ Harald Welte ] + * typo / stylistic fixes by Tom Tessier + * missing glossary items; mostly MSC/3G related + * some more missing items from glossary. + * gsup: Fix description of Purge MS procedure + * Add GPRS + + [ Neels Hofmeyr ] + * D-GSM biblio entries + + [ Vadim Yanitskiy ] + * chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding + * chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo + + -- Pau Espin Pedrol Fri, 03 Jan 2020 13:00:12 +0100 + osmo-gsm-manuals-dev (0.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I555f20da93d4cad0998d5067b5999a4a253061a7 Gerrit-Change-Number: 16713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:11:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:11:54 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 3: Code-Review+1 My comment regarding the logging message still applies. Otherwise I would CR+2 ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:11:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:14:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:14:12 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:14:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:16:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:16:20 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 3: > Patch Set 3: Code-Review+1 > > My comment regarding the logging message still applies. Otherwise I would CR+2 ;) I already changed "get" with "compute" in the log file, that's the important part imho :) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:16:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:21:09 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 4: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/encoding.cpp at 747 PS4, Line 747: bitvec_write_field Can we use bitvec_set_bytes() here? https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 21 PS4, Line 21: #include "inttypes.h" Do we really need this include? https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 186 PS4, Line 186: BSSGP_CAUSE_COND_IE_ERR Unrelated change, and is it really CONDitional IE? Looks more like mandatory. https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 191 PS4, Line 191: TLVP_LEN(tp, BSSGP_IE_IMSI)); Looks like unrelated change. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:21:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:27:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:27:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 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: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:27:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:27:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:27:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 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: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:27:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:27:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:27:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 ) Change subject: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp ...................................................................... MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp When sending MO or MT SMS, we never include both SM-RP-DA/OA IEs at the same time. In case of MO SMS, SM-RP-OA is omitted, and in case of MT SMS - SM-RP-DA is omitted. Change-Id: Ia60bdd2498034b6b849f874cf1eee272abef2b47 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 1ce0b69..0f48ed6 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1618,8 +1618,7 @@ } type record SmsParametersRp { OCT1 msg_ref, - RP_NumberingPlan_and_NumberDigits orig optional, - RP_NumberingPlan_and_NumberDigits dest optional + RP_NumberingPlan_and_NumberDigits smsc_addr optional } type record SmsParameters { SmsParametersTp tp, @@ -1639,6 +1638,16 @@ } } +template RP_NumberingPlan_and_NumberDigits t_RP_Addr(template hexstring addr, + template BIT4 npi := '0001'B, + template BIT3 ton := '001'B, + template BIT1 ext := '1'B) := { + rP_NumberingPlanIdentification := npi, + rP_TypeOfNumber := ton, + rP_Ext := ext, + rP_NumberDigits := addr +} + template (value) SmsParameters t_SmsPars(hexstring tp_daddr := '12345'H) := { tp := { msg_ref := '23'O, @@ -1650,8 +1659,9 @@ }, rp := { msg_ref := '42'O, - orig := omit, - dest := { '0000'B, '000'B, '0'B, '98765'H } + /* We don't really need to have both SM-RP-DA/OA here, because only one IE + * is included in MO/MT SMS, and in the most cases it's the SMSC address. */ + smsc_addr := t_RP_Addr('76722337'H) }, tid := 0, dlci := '03'O, @@ -1700,7 +1710,7 @@ tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs, spars.tp.udl, spars.tp.ud); - rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo); + rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); /* receive CP-ACK for CP-DATA above */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 05d0ef6..439d7f1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -4702,7 +4702,7 @@ tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs, spars.tp.udl, spars.tp.ud); - rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo); + rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); SGsAP.send(l3_mo); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 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: Ia60bdd2498034b6b849f874cf1eee272abef2b47 Gerrit-Change-Number: 16597 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:27:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:27:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA Unlike IMSI, both MSISDN and SMSC address in SM-RP-OA/DA not only contain the BCD encoded digits, but also a little header with NPI (Numbering Plan Identification), ToN (Type of Number), and Extension fields. Change-Id: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Related: OS#4324 --- M library/GSUP_Types.ttcn M library/Osmocom_Types.ttcn M msc/MSC_Tests.ttcn 3 files changed, 57 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 8977d9f..d4b1db1 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -869,6 +869,38 @@ OSMO_GSUP_SM_RP_ODA_ID_NULL ('FF'O) } with { variant "FIELDLENGTH(8)" }; +/* See 3GPP TS 24.011, figures 8.5 and 8.6 */ +type record GSUP_SM_RP_Addr { + BIT1 ext, /* Extension? */ + BIT3 ton, /* Type of Number */ + BIT4 npi, /* Numbering Plan Identification */ + hexstring number length (1..20) +} with { + variant "PADDING(yes)"; + variant "PADDING_PATTERN('1111'B)" +}; + +private function f_pad_SM_RP_Addr(template hexstring number) +return template hexstring { + if (isvalue(number) and not istemplatekind(number, "omit")) { + return f_pad_bcd_number(valueof(number)); + } else { + return number; + } +} + +template GSUP_SM_RP_Addr t_GSUP_SM_RP_Addr(template hexstring number, + template BIT4 npi := '0001'B, + template BIT3 ton := '001'B, + template BIT1 ext := '1'B) := { + ext := ext, + ton := ton, + npi := npi, + /* Work around TITAN's padding problems: encoding works fine, + * but it does not consider 'F'H as padding in decoded data. */ + number := f_pad_SM_RP_Addr(number) +} + /** * SM-RP-DA represents the SM Destination Address, see 7.6.8.1. * It can be either of the following: @@ -879,9 +911,9 @@ * - service centre address */ type union GSUP_SM_RP_DA_ID { - hexstring imsi, - hexstring msisdn, - hexstring smsc_addr + hexstring imsi, + GSUP_SM_RP_Addr msisdn, + GSUP_SM_RP_Addr smsc_addr }; type record GSUP_SM_RP_DA { @@ -904,20 +936,20 @@ id_enc := { imsi := imsi } } -template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr) := { +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } -template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring smsc_addr) := { +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } @@ -953,8 +985,8 @@ * - service centre address */ type union GSUP_SM_RP_OA_ID { - hexstring msisdn, - hexstring smsc_addr + GSUP_SM_RP_Addr msisdn, + GSUP_SM_RP_Addr smsc_addr }; type record GSUP_SM_RP_OA { @@ -967,20 +999,20 @@ )" }; -template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr) := { +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } -template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring smsc_addr) := { +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 046a9ea..2e71123 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -170,5 +170,13 @@ return str; } +function f_pad_bcd_number(hexstring number) return hexstring { + if (lengthof(number) mod 2 != 0) { + return number & 'F'H; + } else { + return number; + } +} + } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 439d7f1..f430335 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2268,14 +2268,16 @@ /* Helper for sending MT SMS over GSUP */ private function f_gsup_forwardSM_req(SmsParameters spars, OCT1 mms := '00'O) runs on BSC_ConnHdlr { + var GSUP_SM_RP_Addr msisdn := valueof(t_GSUP_SM_RP_Addr(g_pars.msisdn)); + GSUP.send(ts_GSUP_MT_FORWARD_SM_REQ( imsi := g_pars.imsi, /* NOTE: MSC should assign RP-MR itself */ sm_rp_mr := 'FF'O, /* FIXME: extract SM-RP-DA from spars.rp.dest */ /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */ - sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), - sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(g_pars.msisdn)), + sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(msisdn)), + sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(msisdn)), /* Encoded SMS TPDU (taken from Wireshark) * FIXME: we should encode spars somehow */ sm_rp_ui := '00068021436500008111328130858200'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 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: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:27:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 12:27:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS ...................................................................... MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Related: OS#4324 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 19 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 0f48ed6..ccebba1 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1777,7 +1777,7 @@ /* Expect CP-DATA(RP-DATA(SMS-DELIVER)) */ tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?); - rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt); + rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt); l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt)); BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)) -> value dtap_mt; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f430335..e0d9c7f 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2166,10 +2166,17 @@ var template GSUP_PDU mo_forwardSM := tr_GSUP_MO_FORWARD_SM_REQ( imsi := g_pars.imsi, sm_rp_mr := spars.rp.msg_ref, - /* FIXME: extract SM-RP-DA from spars.rp.dest */ - sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(?), - /* FIXME: MSISDN coding troubles */ - sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(?), + /* SM-RP-DA: SMSC address */ + sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(t_GSUP_SM_RP_Addr( + number := spars.rp.smsc_addr.rP_NumberDigits, + npi := spars.rp.smsc_addr.rP_NumberingPlanIdentification, + ton := spars.rp.smsc_addr.rP_TypeOfNumber, + ext := spars.rp.smsc_addr.rP_Ext)), + /* SM-RP-OA: subscriber's MSISDN (filled in by MSC) */ + sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(t_GSUP_SM_RP_Addr( + number := g_pars.msisdn, + /* NOTE: MSISDN in g_pars lacks this info, assuming defaults */ + npi := '0001'B, ton := '001'B, ext := '1'B)), /* TODO: can we use decmatch here? */ sm_rp_ui := sm_tpdu ); @@ -2269,15 +2276,18 @@ private function f_gsup_forwardSM_req(SmsParameters spars, OCT1 mms := '00'O) runs on BSC_ConnHdlr { var GSUP_SM_RP_Addr msisdn := valueof(t_GSUP_SM_RP_Addr(g_pars.msisdn)); + var GSUP_SM_RP_Addr smsc := valueof(t_GSUP_SM_RP_Addr( + number := spars.rp.smsc_addr.rP_NumberDigits, + npi := spars.rp.smsc_addr.rP_NumberingPlanIdentification, + ton := spars.rp.smsc_addr.rP_TypeOfNumber, + ext := spars.rp.smsc_addr.rP_Ext)); GSUP.send(ts_GSUP_MT_FORWARD_SM_REQ( imsi := g_pars.imsi, /* NOTE: MSC should assign RP-MR itself */ sm_rp_mr := 'FF'O, - /* FIXME: extract SM-RP-DA from spars.rp.dest */ - /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */ sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(msisdn)), - sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(msisdn)), + sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(smsc)), /* Encoded SMS TPDU (taken from Wireshark) * FIXME: we should encode spars somehow */ sm_rp_ui := '00068021436500008111328130858200'O, @@ -4656,7 +4666,7 @@ /* Expect CP-DATA(RP-DATA(SMS-DELIVER)) */ tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?); - rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt); + rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt); l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt)); SGsAP.receive(l3_mt) -> value sgsap_l3_mt; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 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: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:37:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:37:36 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E30-832bc-dirty_=E2=86=92_1=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16714 ) Change subject: Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 libosmocore required version increased due to include used from libosmo-netif including an include from libosmocore which in previous versions misses including an include from a symbol used. Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 --- M configure.ac M debian/changelog M src/libosmo-mgcp-client/Makefile.am 3 files changed, 46 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/16714/1 diff --git a/configure.ac b/configure.ac index 124f1e6..c74526b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,9 +39,9 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/changelog b/debian/changelog index 2259eac..fe31733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +osmo-mgw (1.7.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * rename codecs_cmp() to codecs_same() + * mgcp_codec: constify 'param' arg + * fix crashes: don't assert on incoming RTP packet size + * mgcp_send(): stop looping on conversion error + * mgcp_codec: split codec_free() off of codec_init() + * fix memleak: actually free strings in mgcp_codec_reset_all() + * mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() + * test_mgcp_codec_pt_translate(): more tests + * differentiate AMR octet-aligned=0 vs =1 + * ptmap: implicitly match '/8000' and '/8000/1' + * mgcp_codec: codec_set(): log about all possible errors + * mgcp_codec_add: fix audio_name size check + * explicitly free codecs in mgcp_rtp_conn_cleanup() + * tweak mgcp_parse_audio_ptime_rtpmap() + * SDP: store all ptmap entries + * mgcp_client_fsm cleanup: Do not assert on DLCX failure + * clear pending requests on MGCP failure + * client: endp fsm: add notify struct, prep for cancel-notify + * client: endp fsm: clear ci[] before dispatching DLCX success + * client: endp fsm: allow cancelling a notify event + * client: endp fsm: add osmo_mgcpc_ep_ci_ep() + * accept MGCP without SDP + * fix use-after-free: require new fsm deferred dealloc, check for term + + [ Pau Espin Pedrol ] + * mgcp_test: Correctly release all endpoints allocated + * mgw: Allocate mgcp_conn instance under tcfg->endpoints + + [ Harald Welte ] + * manual: Fix copy+paste error + * mgcp_client: Check for osmo_fsm_register() error return value + * Move fsm_mgcp_client regstration to __attribute__((contructor)) + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * osmoappdesc.py: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 13:35:09 +0100 + osmo-mgw (1.6.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 8f5513a..61b7822 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=6:0:0 +MGCP_CLIENT_LIBVERSION=7:0:1 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 Gerrit-Change-Number: 16714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:40:56 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jan 2020 12:40:56 +0000 Subject: Change in osmo-bts[master]: l1sap.c: ensure ms power control loop is running In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 to look at the new patch set (#5). Change subject: l1sap.c: ensure ms power control loop is running ...................................................................... l1sap.c: ensure ms power control loop is running When a bad SACCH frame is received the processing of the frame is ended early and lchan_ms_pwr_ctrl() is not called. This means that the power control loop does not get informed about a situation where the signal level is very weak and increasing the ms power would make sense. In order to ensure that the power control keeps working on lost SACCH frames, lets call lchan_ms_pwr_ctrl() with the current RSSI and the requested (BSC) power setting. Related: OS#4281 Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c --- M src/common/l1sap.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/16233/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c Gerrit-Change-Number: 16233 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:42:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jan 2020 12:42:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 to look at the new patch set (#3). Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... BTS_Tests: tolerate empty measurement result on chan est. On channel establishment the first measurement result may lack the measurement reports from the MS. This is normal behavior, so lets tolerate that. Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Related: OS#2975 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 85 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/16649/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:44:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:44:50 +0000 Subject: Change in osmo-bts[master]: l1sap.c: ensure ms power control loop is running In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16233 ) Change subject: l1sap.c: ensure ms power control loop is running ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c Gerrit-Change-Number: 16233 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:44:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 12:56:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 12:56:27 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 12:56:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 13:02:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 13:02:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/3/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/3/bts/BTS_Tests.ttcn at 1771 PS3, Line 1771: var boolean chan_est := false; Are we always using this altstep when the channel is not yet established? Because if the channel is already established it is still necessary to receive 2 measurement reports to get out from it. It may make sense to make chan_est := false a param os as_meas_res, this way the caller (which should know if the chan is already established or not) can decide whether it needs to wait for one extra one or not: altstep as_meas_res(boolean verify_meas := true, boolean chan_est := false) runs on ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 13:02:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 13:02:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 13:02:18 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... rsl: ensure measurement reports are sent osmo-bts currently does not generate a measurement report in case the SACCH of the related traffic channel is lost. This is a problem because the moment when reception gets bad measurmenet reporting is crucial to carry out handover decisions effectively. The presence of a SACCH block controls the conclusion of the measurement interval and the sending of the RSL measurement report. The latter one not only requires a measurmenet indication, it also requires a fully intact SACCH block. Lets use the NOPE / IDLE indications from V1 of the TRXD protocol to ensure a SACCH block is always reported up to l1sap.c. In cases where the SACCH is bad, trigger the sending of the RSL measurement report manually without attaching the measurmenet data from the MS (which we do not have in this case) Related: OS#2975 Depends: osmo-ttcn3-hacks Ib2f511991349ab15e02db9c5e45f0df3645835a4 Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 --- M include/osmo-bts/rsl.h M src/common/l1sap.c M src/common/rsl.c M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c 5 files changed, 41 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 186018e..ff6c2a8 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -45,4 +45,6 @@ int rsl_tx_cbch_load_indication(struct gsm_bts *bts, bool ext_cbch, bool overflow, uint8_t amount); +int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, const struct lapdm_entity *le); + #endif // _RSL_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b6e21fa..4930257 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1238,8 +1238,17 @@ /* bad frame */ if (len == 0) { - if (L1SAP_IS_LINK_SACCH(link_id)) + if (L1SAP_IS_LINK_SACCH(link_id)) { + /* In case we loose a SACCH block, we must take care + * that the related measurement report is sent via RSL. + * This is a fallback method. The report will also + * lack the measurement report from the MS side. See + * also rsl.c:lapdm_rll_tx_cb() */ + le = &lchan->lapdm_ch.lapdm_acch; + rsl_tx_meas_res(lchan, NULL, 0, le); + radio_link_timeout(lchan, 1); + } return -EINVAL; } diff --git a/src/common/rsl.c b/src/common/rsl.c index b315d30..d7e3565 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2834,8 +2834,8 @@ uint16_t toa256_std_dev; } __attribute__((packed)); -/* 8.4.8 MEASUREMENT RESult */ -static int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, const struct lapdm_entity *le) +/* Compose and send 8.4.8 MEASUREMENT RESult via RSL */ +int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, const struct lapdm_entity *le) { struct msgb *msg; uint8_t meas_res[16]; @@ -2895,9 +2895,12 @@ msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info); lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; } - msgb_tl16v_put(msg, RSL_IE_L3_INFO, l3_len, l3); + + if (l3 && l3_len > 0) + msgb_tl16v_put(msg, RSL_IE_L3_INFO, l3_len, l3); if (ms_to_valid(lchan)) { - msgb_tv_put(msg, RSL_IE_MS_TIMING_OFFSET, ms_to2rsl(lchan, le)); + if (l3 && l3_len > 0) + msgb_tv_put(msg, RSL_IE_MS_TIMING_OFFSET, ms_to2rsl(lchan, le)); lchan->ms_t_offs = -1; lchan->p_offs = -1; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index fe93c32..3713b06 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -365,6 +365,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCHTH_0] = { .name = "SACCH/TH(0)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -376,6 +377,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCHTH_1] = { .name = "SACCH/TH(1)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -387,6 +389,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH4_0] = { .name = "SACCH/4(0)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -398,6 +401,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH4_1] = { .name = "SACCH/4(1)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -409,6 +413,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH4_2] = { .name = "SACCH/4(2)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -420,6 +425,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH4_3] = { .name = "SACCH/4(3)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -431,6 +437,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_0] = { .name = "SACCH/8(0)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -442,6 +449,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_1] = { .name = "SACCH/8(1)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -453,6 +461,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_2] = { .name = "SACCH/8(2)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -464,6 +473,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_3] = { .name = "SACCH/8(3)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -475,6 +485,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_4] = { .name = "SACCH/8(4)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -486,6 +497,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_5] = { .name = "SACCH/8(5)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -497,6 +509,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_6] = { .name = "SACCH/8(6)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -508,6 +521,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_SACCH8_7] = { .name = "SACCH/8(7)", /* 3GPP TS 05.02, section 3.3.4.1 */ @@ -519,6 +533,7 @@ .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, .ul_fn = rx_data_fn, + .nope_fn = rx_data_fn, }, [TRXC_PDTCH] = { .name = "PDTCH", /* 3GPP TS 05.02, sections 3.2.4, 3.3.2.4 */ diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index c3608bf..2785d09 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -945,10 +945,14 @@ (*ci_cb_num)++; } - /* copy burst to buffer of 4 bursts */ + /* Copy burst to buffer of 4 bursts. If the burst indication contains + * no data, ensure that the buffer does not stay uninitalized */ burst = *bursts_p + bid * 116; - memcpy(burst, bi->burst + 3, 58); - memcpy(burst + 58, bi->burst + 87, 58); + if (bi->burst_len > 0) { + memcpy(burst, bi->burst + 3, 58); + memcpy(burst + 58, bi->burst + 87, 58); + } else + memset(burst, 0, 58 * 2); /* send burst information to loops process */ if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 13:02:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 13:02:18 +0000 Subject: Change in osmo-bts[master]: l1sap.c: ensure ms power control loop is running In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16233 ) Change subject: l1sap.c: ensure ms power control loop is running ...................................................................... l1sap.c: ensure ms power control loop is running When a bad SACCH frame is received the processing of the frame is ended early and lchan_ms_pwr_ctrl() is not called. This means that the power control loop does not get informed about a situation where the signal level is very weak and increasing the ms power would make sense. In order to ensure that the power control keeps working on lost SACCH frames, lets call lchan_ms_pwr_ctrl() with the current RSSI and the requested (BSC) power setting. Related: OS#4281 Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c --- M src/common/l1sap.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 4930257..b73de29 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1244,10 +1244,12 @@ * This is a fallback method. The report will also * lack the measurement report from the MS side. See * also rsl.c:lapdm_rll_tx_cb() */ + LOGPGT(DL1P, LOGL_INFO, &g_time, "Lost SACCH block, faking meas reports and ms pwr\n"); le = &lchan->lapdm_ch.lapdm_acch; rsl_tx_meas_res(lchan, NULL, 0, le); radio_link_timeout(lchan, 1); + lchan_ms_pwr_ctrl(lchan, lchan->ms_power_ctrl.current, data_ind->rssi); } return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c Gerrit-Change-Number: 16233 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 13:30:13 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jan 2020 13:30:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn at 1734 PS1, Line 1734: * MS related measurement (l1_info, l3_info and ms timing offset. */ > missing ). Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn at 1805 PS1, Line 1805: > ws Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/2/bts/BTS_Tests.ttcn at 1788 PS2, Line 1788: [] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { > how are we guarding this to prevent a situation where the MS is sending many empty measurement repor [?] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/3/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/3/bts/BTS_Tests.ttcn at 1771 PS3, Line 1771: var boolean chan_est := false; > Are we always using this altstep when the channel is not yet established? Because if the channel is [?] I do not see the problem. This variable is used to guard against two corner cases that may happen in the very beginning of the establishment phase. The mechanism is: Once we see one of our "Osmocom" measurement reports we know that the channel is fully up and there must not be any hardcoded or empty measurement reports. If a caller uses this on a channel that is already up, then we will receive "Osmocom" measurement reports and the corner cases are not coming into play anyway. Is the variable name confusing? maybe it should be different? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 13:30:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:02:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:02:51 +0000 Subject: Change in osmo-iuh[master]: debian/rules: Fix dbg pacakges In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16715 ) Change subject: debian/rules: Fix dbg pacakges ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5e0e13a1d4fa7db373807d72d293da6933966452 Gerrit-Change-Number: 16715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:02:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:02:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:02:53 +0000 Subject: Change in osmo-iuh[master]: debian: Split libosmo-sabp from libosmo-ranap package In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16716 ) Change subject: debian: Split libosmo-sabp from libosmo-ranap package ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I936220e95a3334d8052bb2c52fbf335a8a5c3711 Gerrit-Change-Number: 16716 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:02:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:04:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:04:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:04:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:04:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:04:46 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E18-258b_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 ) Change subject: Bump version: 0.2.0.18-258b ? 0.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I555f20da93d4cad0998d5067b5999a4a253061a7 Gerrit-Change-Number: 16713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:04:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:05:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:05:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 ) Change subject: Bump version: 1.3.1 ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia6693372994791bac4ab86808729f5e568dd9176 Gerrit-Change-Number: 16710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:05:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:05:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jan 2020 14:05:15 +0000 Subject: Change in pysim[master]: cards: Add support for sysmo-isim-sja2 In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16691 ) Change subject: cards: Add support for sysmo-isim-sja2 ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf Gerrit-Change-Number: 16691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 03 Jan 2020 14:05:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:05:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:05:51 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E108-c6a8-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16702 ) Change subject: Bump version: 1.2.0.108-c6a8-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5698bfe45467a8b0e44549105aaf27b8da500de8 Gerrit-Change-Number: 16702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:05:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:06:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:06:19 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16700 ) Change subject: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2b9a65d42615aa3cce6906ddd53758bc3052942 Gerrit-Change-Number: 16700 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:06:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:06:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:06:24 +0000 Subject: Change in libosmocore[master]: Drop empty file debian/patches/series In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16701 ) Change subject: Drop empty file debian/patches/series ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1a4aa5d6785aa7ff7dc454930a84d73fe1114726 Gerrit-Change-Number: 16701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:06:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:07:27 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 03 Jan 2020 14:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:07:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:07:51 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:08:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:08:05 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:08:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:08:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:08:27 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 03 Jan 2020 14:08:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:08:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:08:50 +0000 Subject: Change in osmo-trx[master]: doc: Update vty reference xml file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16699 ) Change subject: doc: Update vty reference xml file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 Gerrit-Change-Number: 16699 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:08:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:09:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:09:13 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E30-832bc-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16714 ) Change subject: Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 Gerrit-Change-Number: 16714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:09:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:09:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:09:32 +0000 Subject: Change in libosmo-sccp[master]: debian: Drop patches directory containing old patch not longer required In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 ) Change subject: debian: Drop patches directory containing old patch not longer required ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8e518a28cc54f42ff3e7e9205eefbce3a1d67d9d Gerrit-Change-Number: 16708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:09:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:09:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:09:34 +0000 Subject: Change in libosmo-sccp[master]: debian: Drop patches directory containing old patch not longer required In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 ) Change subject: debian: Drop patches directory containing old patch not longer required ...................................................................... debian: Drop patches directory containing old patch not longer required Change-Id: I8e518a28cc54f42ff3e7e9205eefbce3a1d67d9d --- D debian/patches/debian-changes-0.0.2-1 D debian/patches/series 2 files changed, 0 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/patches/debian-changes-0.0.2-1 b/debian/patches/debian-changes-0.0.2-1 deleted file mode 100644 index ed4a4df..0000000 --- a/debian/patches/debian-changes-0.0.2-1 +++ /dev/null @@ -1,29 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - libosmo-sccp (0.0.2-1) unstable; urgency=low - . - * Initial release (Closes: #nnnn) - . - The person named in the Author field signed this changelog entry. -Author: Harald Welte - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ libosmo-sccp-0.0.2/.version -@@ -0,0 +1 @@ -+0.0.2 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a3659e3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes-0.0.2-1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8e518a28cc54f42ff3e7e9205eefbce3a1d67d9d Gerrit-Change-Number: 16708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:09:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:09:57 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E16-293b_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 ) Change subject: Bump version: 0.2.0.16-293b ? 0.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6b04b483912fe16333b7737af7652329c52f6646 Gerrit-Change-Number: 16703 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:09:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:10:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:10:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E4-7aa6_=E2=86=92_0=2E1=2E2?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16704 ) Change subject: Bump version: 0.1.1.4-7aa6 ? 0.1.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55 Gerrit-Change-Number: 16704 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:10:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:10:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:10:31 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E32-bd8f-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 ) Change subject: Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 Gerrit-Change-Number: 16705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:10:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:10:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:10:50 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E8-4c2c-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16706 ) Change subject: Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 Gerrit-Change-Number: 16706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:10:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:11:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 14:11:04 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_re... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16683 ) Change subject: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:11:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:11:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:11:28 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E16-6413a-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16707 ) Change subject: Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 Gerrit-Change-Number: 16707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:11:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:11:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:11:58 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E71-bb75-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 ) Change subject: Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 Gerrit-Change-Number: 16709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:11:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:13:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:13:27 +0000 Subject: Change in pysim[master]: cards: Add support for sysmo-isim-sja2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16691 ) Change subject: cards: Add support for sysmo-isim-sja2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf Gerrit-Change-Number: 16691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 14:13:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:14:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 14:14:03 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_re... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16683 ) Change subject: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:14:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:27:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 14:27:03 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_re... In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 to look at the new patch set (#3). Change subject: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() ...................................................................... libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() During the last congress, we have noticed that OsmoMSC crashes on receipt of malformed MM Identity Response messages: BSSAP Message Type: Direct Transfer (0x01) Data Link Connection Identifier 00.. .... = Control Channel: not further specified (0x0) ..00 0... = Spare: 0x0 .... .000 = SAPI: RR/MM/CC (0x0) Length: 11 GSM A-I/F DTAP - Identity Response Protocol Discriminator: Mobility Management messages (5) .... 0101 = Protocol discriminator: Mobility Management messages (0x5) 0000 .... = Skip Indicator: No indication of selected PLMN (0) 01.. .... = Sequence number: 1 ..01 1001 = DTAP Mobility Management Message Type: Identity Response (0x19) Mobile Identity - Format Unknown Length: 8 .... 1... = Odd/even indication: Odd number of identity digits .... .111 = Mobile Identity Type: Unknown (7) <-- This makes OsmoMSC crash [Expert Info (Warning/Protocol): Unknown format 7] [Unknown format 7] [Severity level: Warning] [Group: Protocol] The value '111'B is not a valid Mobile Identity type, and shall be considered as reserved according to 3GPP TS 24.008, section 10.5.1.4. Later on it was discovered that '000'B also crashes OsmoMSC in the same way. The crash itself is provoked by OSMO_ASSERT(0) in vlr_subscr_rx_id_resp(). Let's keep that assert in there, and make sure that: - on receipt of MM Identity Response, Mobile Identity type matches the one in MM Identity Request; - on receipt of RR Ciphering Mode Complete, Mobile Identity contains IMEI(SV) if present. Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 TTCN-3 test case: I62f23355eb91df2edf9dc837c928cb86b530b743 Fixes: OS#4340 --- M include/osmocom/msc/msc_a.h M src/libmsc/gsm_04_08.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/16683/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:30:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:30:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:30:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:33:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:33:38 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16700 ) Change subject: osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac ...................................................................... osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac Remove brackets and check for "(" after PKG_CHECK_MODULES to avoid getting comments containing the keyword. Change-Id: Ie2b9a65d42615aa3cce6906ddd53758bc3052942 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 916af84..31cd1a0 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -29,7 +29,7 @@ else configureac_file="configure.ac" fi - configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g") + configureac_list=$(grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g") echo "$configureac_list" | \ { return_error=0 while read -r dep ver; do -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2b9a65d42615aa3cce6906ddd53758bc3052942 Gerrit-Change-Number: 16700 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:33:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:33:40 +0000 Subject: Change in libosmocore[master]: Drop empty file debian/patches/series In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16701 ) Change subject: Drop empty file debian/patches/series ...................................................................... Drop empty file debian/patches/series Change-Id: I1a4aa5d6785aa7ff7dc454930a84d73fe1114726 --- D debian/patches/series 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29..0000000 --- a/debian/patches/series +++ /dev/null -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1a4aa5d6785aa7ff7dc454930a84d73fe1114726 Gerrit-Change-Number: 16701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:33:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:33:41 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E108-c6a8-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16702 ) Change subject: Bump version: 1.2.0.108-c6a8-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.108-c6a8-dirty ? 1.3.0 Change-Id: I5698bfe45467a8b0e44549105aaf27b8da500de8 --- M TODO-RELEASE M debian/changelog M src/Makefile.am M src/codec/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 8 files changed, 140 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index be858ae..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,11 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -core osmo_tdef_get() change val_if_not_present arg from unsigned long to long to allow passing -1 -core struct osmo_tdef fields min_val,max_val added, ABI break (arrays of structs used in programs) -gsm API added osmo_gsm48_rfpowercap2powerclass() -gb API added bssgp_bvc_ctx_free() -core osmo_sockaddr_str_from_32n(), - osmo_sockaddr_str_to_32n() Deprecate: named 'n' but use host byte order. -core osmo_sockaddr_str_from_32h(), - osmo_sockaddr_str_to_32h() New, use host byte order and are named appropriately. diff --git a/debian/changelog b/debian/changelog index 0e28089..3a9e2b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,137 @@ +libosmocore (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-release.sh: Add DRY_RUN mode + * osmo-release.sh: Verify debian/rules dh_strip lines match LIBVERSION + * osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control + * osmo-release.sh: Check patches under debian/patches apply + * osmo-release.sh: Support releasing openbsc.git + * vty: Register logp cmd next to logging commands + * tdef: Introduce API osmo_tdef_set() + * tdef_vty.h: Add missing header dependencies + * logging_internal.h: Fix osmo_log_info definition + * osmo-release.sh: update TODO-RELEASE for non-lib projects too + * logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h + * msgb: Allow size==headroom in msgb_alloc_headroom*() + * tdef: Introduce min_val and max_val fields + * tdef_test: verify case where osmo_tdef_set returns -EEXIST + * vty: Optionally Set/replace cfg file during cmd 'write file' + * logging: Introduce mutex API to manage log_target in multi-thread envs + * socket.c: Move glibc workarounds to same place in addrinfo_helper() + * vty: Fix go_parent_cb not called for indented nodes at end of cfg file + * tdef: Return correct snprintf value for osmo_tdef_range_str_buf() + * socket: Introduce API osmo_sock_init2_multiaddr() + * socket: Remove unneeded condition check in osmo_sock_init2_multiaddr() + * libosmocore.pc.in: Append -lsctp to Libs.private + * socket.c: build multiaddr socket API helpers only if used by public APIs + * configure: Introduce --disable-libsctp and error by default if libsctp not found + * vty: Return error if cmd returns CMD_WARNING while reading cfg file + * cosmetic: gsm_04_08.h: Fix trailing whitespace + * gsm_04_08.h: Introduce API osmo_gsm48_rfpowercap2powerclass() + * gsm: Fix compilation error under some compilers + * gsm: gsm_utils: Fix return type of API ms_class_gmsk_dbm() and add unit tests + * gsm: gsm_04_08.h: Allow accessing classmark2 as struct instead of uint32_t + * Introduce fields related to DTAP DLCI + * osmo-release.sh: Use set -e before applying changes to prepare release + * osmo-release.sh: Improve of PKG_CHECK_MODULES from configure.ac + * Drop empty file debian/patches/series + + [ Harald Welte ] + * codec/ecu_fr: Mark input TCH frame as 'const' as we only read it + * context: Add support for [per-thread] global talloc contexts + * cbsp: Fix endless loop iteration when decoding cell list IEs + * cbsp: Remove printf() statement from early development/debugging + * cbsp: Fix decoding of WRITE-REPLACE payload + * codec/ecu: Introduce new generic Error Concealment Unit abstraction + * gsm_08_58: Add vendor-specific Message Type for ETWS Primary Warning + * Introduce BTS_FEAT_ETWS_PN for communicating ETWS PN capability + * sim/class_tables: Fix typo in comment + * cosmetic: clarify c_iflag in osmo_serial_init() + * select: Make file descriptor lists per-thread + * 04.80: Deprecate gsm0480_create_ussd_resp() + * Check for osmo_fsm_register() error return value + * gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller + * osmo-arfcn: Fix '-h' option + * utils: exit(2) on unsupported positional arguments on command line + * gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE + * gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" + * libosmocore libusb integration + * usb: Import a variety of libusb utility functions from simtrace + * debian/control: Add missing libusb-1.0-0-dev dependency + * Introduce helper functions for safe fork+exec of processes + + [ Neels Hofmeyr ] + * add vty logp command to echo on all log targets + * osmo_tdef_get(): allow passing -1 as default timeout + * fix: vty crash by logging during VTY_CLOSED event handling + * OSMO_SOCKADDR_STR_FMT_ARGS: remove useless condition + * OSMO_SOCKADDR_STR_FMT_ARGS: guard against NULL pointer + * tdef: fixup osmo_tdef_set() + * gsup: add OSMO_GSUP_SUPPORTED_RAT_TYPES_IE and OSMO_GSUP_CURRENT_RAT_TYPE_IE + * API doc tweaks (mncc.h, gsm_08_08.h) + * add osmo_fsm_set_dealloc_ctx(), to help with use-after-free + * fsm: refuse state chg and events after term + * add osmo_sockaddr_str_is_nonzero() + * test: add OSMO_SOCKADDR_STR_FMT to sockaddr_str_test.c + * fix OSMO_SOCKADDR_STR_FMT for IPv6 + * add osmo_sockaddr_str_cmp() + * utils.c: fix various inaccurate API doc about return values + * logging.h: define ansi color constants + * fix DLSMS logging category color: '[1:38m' isn't actually defined + * cosmetic: logging.h: fix comment s/levels/subsystems + * osmo_sockaddr_str: API doc: fix 32bit addr mixup of host/network byte order + * utils.h: add OSMO_NAME_C_IMPL() macro + * fix osmo_escape_str_c() and osmo_quote_str_c() + * GSUP: rename E_ROUTING_ERROR to ROUTING_ERROR + * fsm.h: add missing include of logging.h + * msgb_put: more elaborate logging of head/tailroom failure + * utils_test: add osmo_print_n_test() + * utils: add osmo_strnchr() + * osmo_sockaddr_str: deprecate osmo_sockaddr_str_*_32n() + * vty: track parent nodes also for telnet sessions + * vty_app_info.is_config_node: add OSMO_DEPRECATED + * add osmo_escape_cstr and osmo_quote_cstr + * add all missing OSMO_GSUP_TO_MSGT_*() macros + + [ Oliver Smith ] + * Cosmetic: l1sap.h: change /* !< to /*!< + * logging.h: add L1 SAPI related context and filter + * gprs_ns_vty: return success for disabled FR/GRE + * debian, utils: switch to python 3 + + [ Ruben Undheim ] + * MAXPATHLEN set if not defined + * No fail if no /proc/cpuinfo + + [ Philipp Maier ] + * cosmetic: Move comment to the right place + * cosmetic: Add comment on GSM-FR ECU struct + * ecu_fr: increase test coverage for FR ECU implementation + * gsm0508: add functions to calculate beginning of a block + + [ Vadim Yanitskiy ] + * gsm29205_test: fix error: missing braces around initializer + * GPRS/BSSGP: introduce bssgp_bvc_ctx_free() + * logging/vty: do not print deprecated logging commands to stdout + * logging/vty: use LOG_LEVEL_ARGS in logging_vty_add_deprecated_subsys() + * logging/vty: fix: actually ignore deprecated logging commands + * logging/vty: fix vty_read_file(): do not write warnings to stdin + * logging/vty: fix: do not close stderr in vty_close() + * libosmovty: properly initialize vty->fd in vty_new() + * libosmovty: simplify condition checking vty->fd in vty_close() + * core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE + + [ Daniel Willmann ] + * libosmogsm: add support for XOR authentication + + [ Vasil Velichkov ] + * Add code coverage support + + [ Eric Wild ] + * sim: allow opening reader# > 0 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 18:42:29 +0100 + libosmocore (1.2.0) unstable; urgency=medium [ Harald Welte ] diff --git a/src/Makefile.am b/src/Makefile.am index eeb3f7d..34cda0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=14:0:2 +LIBVERSION=15:0:3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index c9d7a22..ac33aa0 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:1:1 +LIBVERSION=2:0:2 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index e14c11c..7248413 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=9:1:0 +LIBVERSION=10:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4a1faca..6935eab 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=13:0:0 +LIBVERSION=14:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 1a8e508..c608757 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:1:1 +LIBVERSION=1:2:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index abed92a..35350cc 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=8:0:4 +LIBVERSION=8:1:4 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5698bfe45467a8b0e44549105aaf27b8da500de8 Gerrit-Change-Number: 16702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:35:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:35:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E4-7aa6_=E2=86=92_0=2E1=2E2?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16704 ) Change subject: Bump version: 0.1.1.4-7aa6 ? 0.1.2 ...................................................................... Bump version: 0.1.1.4-7aa6 ? 0.1.2 Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 168df55..14a0d0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-pcap (0.1.2) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: README.md: fix typo + * osmoappdesc.py: fix paths to configs + * Cosmetic: README.md: document how to run tests + * osmoappdesc.py: switch to python 3 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:19:28 +0100 + osmo-pcap (0.1.1) unstable; urgency=medium * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55 Gerrit-Change-Number: 16704 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:36:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:36:48 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E18-258b_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 ) Change subject: Bump version: 0.2.0.18-258b ? 0.3.0 ...................................................................... Bump version: 0.2.0.18-258b ? 0.3.0 Change-Id: I555f20da93d4cad0998d5067b5999a4a253061a7 --- M debian/changelog 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 4b35c12..852d8e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +osmo-gsm-manuals-dev (0.3.0) unstable; urgency=medium + + [ Oliver Smith ] + * tests/Makefile.am: always put glossary at the end + * Cosmetic: fix Makefile.vty.reference.inc example + * Support multiple VTY reference manuals + * tests: add second VTY reference + * Drop python2 and pychart dependencies + * debian/check-depends.sh: add inkscape to depends + + [ Pau Espin Pedrol ] + * sigtran-osmocom.adoc: Fix typos + * Fix python-nwdiag dependency on new debian distros + * trx_if.adoc: Fix typo and formatting of bullet list + + [ Martin Hauke ] + * Fix some typos + + [ Harald Welte ] + * typo / stylistic fixes by Tom Tessier + * missing glossary items; mostly MSC/3G related + * some more missing items from glossary. + * gsup: Fix description of Purge MS procedure + * Add GPRS + + [ Neels Hofmeyr ] + * D-GSM biblio entries + + [ Vadim Yanitskiy ] + * chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding + * chapters/gsup.adoc: fix message definitions containing gsup-ie-pdpinfo + + -- Pau Espin Pedrol Fri, 03 Jan 2020 13:00:12 +0100 + osmo-gsm-manuals-dev (0.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I555f20da93d4cad0998d5067b5999a4a253061a7 Gerrit-Change-Number: 16713 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:38:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:38:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E16-293b_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 ) Change subject: Bump version: 0.2.0.16-293b ? 0.3.0 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6b04b483912fe16333b7737af7652329c52f6646 Gerrit-Change-Number: 16703 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:38:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 14:38:39 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 ) Change subject: Bump version: 1.3.1 ? 1.4.0 ...................................................................... Bump version: 1.3.1 ? 1.4.0 Change-Id: Ia6693372994791bac4ab86808729f5e568dd9176 --- M debian/changelog 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index bbe3db5..0391941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +osmo-sip-connector (1.4.0) unstable; urgency=medium + + [ Keith ] + * coverity: Address issue found by coverity + + [ Philipp Maier ] + * mncc: check fd before closing a connection + + [ Alexander Couzens ] + * .service: require to ran after network-online.target + * exit if the sip agent failed to start + + [ Oliver Smith ] + * mncc.c: fix gsm_mncc_rtp size checks + * osmoappdesc.py: switch to python 3 + + [ Neels Hofmeyr ] + * MNCC v6: add optional SDP to the socket protocol + * logging from sofia: add missing newline + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:35:01 +0100 + osmo-sip-connector (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia6693372994791bac4ab86808729f5e568dd9176 Gerrit-Change-Number: 16710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 14:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 14:54:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 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: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 14:54:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 15:10:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 15:10:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 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: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 15:10:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 15:17:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 15:17:48 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E71-bb75-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 ) Change subject: Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 ...................................................................... Patch Set 1: Expected failure, requires newly released libosmo-netif 0.7.0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 Gerrit-Change-Number: 16709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 15:17:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 15:33:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 15:33:18 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/encoding.cpp at 747 PS4, Line 747: bitvec_write_field > Can we use bitvec_set_bytes() here? Indeed. AFAIU it should looke like: bitvec_write_field(dest, &wp, mi_len, 8); // Mobile Identity length bitvec_set_bytes(dest, mi, mi_len); // Mobile Identity https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 21 PS4, Line 21: #include "inttypes.h" > Do we really need this include? Looks like we don't, probably it's a leftover from an older version when I was working on it. https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 186 PS4, Line 186: BSSGP_CAUSE_COND_IE_ERR > Unrelated change, and is it really CONDitional IE? Looks more like mandatory. Indeed, I should use BSSGP_CAUSE_MISSING_MAND_IE instead. I'm improving all this function / code path, so I think it makes sense to keep it in the same patch. https://gerrit.osmocom.org/c/osmo-pcu/+/16536/4/src/gprs_bssgp_pcu.cpp at 191 PS4, Line 191: TLVP_LEN(tp, BSSGP_IE_IMSI)); > Looks like unrelated change. Again, I'm really reworking the full function here, despite gerrit doesn't show that. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 15:33:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:03:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:03:35 +0000 Subject: Change in osmo-iuh[master]: debian/rules: Fix dbg pacakges In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16715 ) Change subject: debian/rules: Fix dbg pacakges ...................................................................... debian/rules: Fix dbg pacakges Related: OS#4342 Change-Id: I5e0e13a1d4fa7db373807d72d293da6933966452 --- M debian/rules 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 6f20b3e..f6c91a3 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,8 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: - dh_strip --dbg-package=libosmo-ranap-dbg - dh_strip --dbg-package=osmo-hnbgw + dh_strip -plibosmo-ranap2 --dbg-package=libosmo-ranap-dbg + dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg # Print test results in case of a failure override_dh_auto_test: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5e0e13a1d4fa7db373807d72d293da6933966452 Gerrit-Change-Number: 16715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:03:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:03:36 +0000 Subject: Change in osmo-iuh[master]: debian: Split libosmo-sabp from libosmo-ranap package In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16716 ) Change subject: debian: Split libosmo-sabp from libosmo-ranap package ...................................................................... debian: Split libosmo-sabp from libosmo-ranap package Related: OS#4342 Change-Id: I936220e95a3334d8052bb2c52fbf335a8a5c3711 --- M debian/control M debian/libosmo-ranap-dev.install M debian/libosmo-ranap2.install A debian/libosmo-sabp-dev.install A debian/libosmo-sabp0.install M debian/rules 6 files changed, 31 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index d07ab67..c6e0714 100644 --- a/debian/control +++ b/debian/control @@ -57,3 +57,25 @@ Multi-Arch: same Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-sabp0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Osmocom code for the Iuh interface (SABP) + +Package: libosmo-sabp-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: libosmo-sabp0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (SABP) + +Package: libosmo-sabp-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-sabp0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (SABP) diff --git a/debian/libosmo-ranap-dev.install b/debian/libosmo-ranap-dev.install index 5bd9dd0..0da8f6d 100644 --- a/debian/libosmo-ranap-dev.install +++ b/debian/libosmo-ranap-dev.install @@ -1,3 +1,3 @@ -usr/include -usr/lib/*/*.so -usr/lib/*/pkgconfig/*.pc +usr/include/osmocom/ranap +usr/lib/*/libosmo-ranap.so +usr/lib/*/pkgconfig/libosmo-ranap.pc diff --git a/debian/libosmo-ranap2.install b/debian/libosmo-ranap2.install index 3de3b10..56abca6 100644 --- a/debian/libosmo-ranap2.install +++ b/debian/libosmo-ranap2.install @@ -1 +1 @@ -usr/lib/*/*.so.* +usr/lib/*/libosmo-ranap*.so.* diff --git a/debian/libosmo-sabp-dev.install b/debian/libosmo-sabp-dev.install new file mode 100644 index 0000000..7e8594c --- /dev/null +++ b/debian/libosmo-sabp-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/sabp +usr/lib/*/libosmo-sabp.so +usr/lib/*/pkgconfig/libosmo-sabp.pc diff --git a/debian/libosmo-sabp0.install b/debian/libosmo-sabp0.install new file mode 100644 index 0000000..01cecb5 --- /dev/null +++ b/debian/libosmo-sabp0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-sabp*.so.* diff --git a/debian/rules b/debian/rules index f6c91a3..e821a57 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: dh_strip -plibosmo-ranap2 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg # Print test results in case of a failure -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I936220e95a3334d8052bb2c52fbf335a8a5c3711 Gerrit-Change-Number: 16716 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:05:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:05:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E23-11a1_=E2=86=92_0=2E6=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16717 ) Change subject: Bump version: 0.5.0.23-11a1 ? 0.6.0 ...................................................................... Bump version: 0.5.0.23-11a1 ? 0.6.0 Change-Id: I5f42c0ad1a930004415f097d984e1fd1b2d277e6 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmo-ranap3.install M debian/rules M src/Makefile.am 6 files changed, 44 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/17/16717/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b967e56..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libranap iu_client.h struct ranap_ue_conn_ctx: add field notification -libranap iu_client.h struct ranap_ue_conn_ctx: add field release_timeout -libranap iu_client.h struct ranap_ue_conn_ctx: add field free_on_release diff --git a/debian/changelog b/debian/changelog index cdf7a94..f59c49e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +osmo-iuh (0.6.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw + * osmo-hnbgw: make sure osmo_ss7_init() executed successfully + + [ Alexander Couzens ] + * iu_client: sccp_sap_up: set rc early + * iu_client: ensure UE is not NULL on CO primitives + * iu_client: sccp_sap_up: don't decode empty disconnect indications + * iu_client: introduce ranap_iu_free_ue() to free the UE connections + * iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication + * iu_client: introduce a guard around global_iu_event_cb + * iu_client: allow to control the notifications + * iu_client: introduce ranap_iu_tx_release_free() + * iu_client: introduce UE field free_on_release + * iu_client: pass return value of osmo_sccp_user_sap_down() towards the caller + * iu_client: ranap_iu_tx_release() change default cause code to Success + + [ Pau Espin Pedrol ] + * hnbgw: Add libosmoctrl's VTY CTRL command initialization + * debian/rules: Fix dbg pacakges + * debian: Split libosmo-sabp from libosmo-ranap package + + [ Harald Welte ] + * asn1enum.pl: Make compatible with modern perl + * sabp: Initial import of SABP ASN.1 from 3GPP TS 25.419 V11.1.0 (2013-03) + * sabp: fixup SABP ASN.1 to avoid IOC (which are not supported by our toolchain) + * sabp: Add Procedure Codes and IEI constants to CommonDataTypes + * sabp: Generate C/H files for SABP; create libosmo-sabp + * Initial minimal OsmoHNBGW user manual + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * gitignore: add gen_sabp.stamp + * debian, asn1tostruct.py: switch to python3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 17:04:15 +0100 + osmo-iuh (0.5.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index c6e0714..4d66d18 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Depends: osmo-hnbgw (= ${binary:Version}), ${misc:Depends} Description: osmocom Home Node B Gateway -Package: libosmo-ranap2 +Package: libosmo-ranap3 Section: libs Architecture: any Multi-Arch: same @@ -48,14 +48,14 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-ranap-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-sabp0 diff --git a/debian/libosmo-ranap2.install b/debian/libosmo-ranap3.install similarity index 100% rename from debian/libosmo-ranap2.install rename to debian/libosmo-ranap3.install diff --git a/debian/rules b/debian/rules index e821a57..c3bdf50 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: - dh_strip -plibosmo-ranap2 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/src/Makefile.am b/src/Makefile.am index b1f8153..1c3a64a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ # build the shared RANAP + SABP library # -RANAP_LIBVERSION=2:2:0 +RANAP_LIBVERSION=3:0:0 SABP_LIBVERSION=0:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5f42c0ad1a930004415f097d984e1fd1b2d277e6 Gerrit-Change-Number: 16717 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:19:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:19:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E95-24e7-dirty_=E2=86=92_1=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16718 ) Change subject: Bump version: 1.1.0.95-24e7-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.95-24e7-dirty ? 1.2.0 Change-Id: Id132c615f7398402ac20d179e5917bea58ef3334 --- M configure.ac M debian/changelog 2 files changed, 117 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/16718/1 diff --git a/configure.ac b/configure.ac index b70d934..1bcd2fe 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) diff --git a/debian/changelog b/debian/changelog index 5cb0f0a..aa3269b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,114 @@ +osmo-bts (1.2.0) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: virtual: l1sap.c: fix typos + * virtual: set link quality for GSMTAP_CHANNEL_RACH + * pcu_sock: fix endian-swapped CellID + * gitignore: add oc2g generated files + * log: set L1 SAPI log context + * vty: add "logging filter l1-sapi" + * vty.c: don't ignore get_string_value() errors + * vty.c: avoid coverity BAD_SHIFT issues + * osmo-bts-virtual.cfg: ms-power-control dsp -> osmo + + [ Harald Welte ] + * ETWS Primary Notification via P1 Rest Octets + * pcu_interface: Forward ETWS Primary Notification to PCU + * doc: Update Abis manual RSL section with ETWS related infomration + * osmo-bts-trx/scheduler: prevent uninitialized memory access + * osmo-bts-trx: migrate to new generic ECU abstraction + * rach_pass_filter(): Add information about channel type + + [ Vadim Yanitskiy ] + * common/rsl.c: fix possible NULL-pointer dereference + * osmo-bts-trx/scheduler: fix tx_tch_common(): do not send AMR BFI twice + * osmo-bts-trx/scheduler: add FIXME note about FACCH/H and BFI + * osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() + * scheduler: fix handling of PTCCH/U and PTCCH/D logical channels + * osmo-bts-trx/scheduler: also detect TSC for Access Bursts on PDCH + * common/l1sap: increase ToA precision for packet Access Bursts + * L1SAP: use RSL_CHAN_* definitions from libosmogsm + * L1SAP: also consider RSL_CHAN_OSMO_CBCH8 as CBCH + * L1SAP: clarify debug messages in rach_pass_filter() + * L1SAP: do not pass unused parameter to l1sap_handover_rach() + * L1SAP: refactor handling of Access Bursts on PDCH + * L1SAP: properly handle 11-bit encoded RACH.ind in gsmtap_ph_rach() + * L1SAP: use the actual ARFCN for outgoing PCUIF messages + * L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U + * L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default + * L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them + * README.md: update osmo-bts-trx specific limitations + * osmo-bts-trx/scheduler: fix: print the last frame number in rx_data_fn() + * osmo-bts-trx: general handling of NOPE / IDLE indications + * osmo-bts-trx/trx_if.c: fix: always initialize bi->burst_len for NOPE.ind + * osmo-bts-trx/trx_if.c: also print both RSSI and ToA256 for NOPE.ind + * osmo-bts-trx/trx_if.c: fix: NOPE.ind also contains C/I field + * pcuif_proto.h: extend RACH.ind with TRX and timeslot number fields + * common/vty.c: fix: properly assert() the result of get_string_value() + * common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() + * common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() + * osmo-bts-trx/vty: ensure backwards compatibility with older config files + + [ Pau Espin Pedrol ] + * bts-trx: Log case where no SETFORMAT is sent + * bts-trx: Change super verbose IDLE ind not-supported line to DEBUG + * doc: bts-models.adoc: Fix typos in rts-advance section + * bts-trx: vty: Use API to get poweron state + * bts.h: Remove non-existent function definitions + * scheduler.c: Move some message log level to DEBUG + * scheduler: Use OSMO_ASSERT instead of abort + * l1sap: Log conn dropped due to radio link counter timeout + * struct gsm_bts: Add model_priv pointer handing bts_model specific data + * bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx private data + * bts-trx: vty: Print phy link state in cmd 'show transceiver' + * bts-trx: trx_set_bts(): Avoid double loop by checking current trx + * bts-trx: Rework code handling poweron state + * bts-trx: Don't reset transceiver_available in scheduler_trx.c + * bts-trx: Get rid of messy transceiver_available state handler + * bts-trx: Drop unused func check_transceiver_availability() + * bts-trx: Log TRXC and TRXD socket recv()/send() failures + * bts-trx: Time out if no clock ind recvd after RSP POWERON + * cosmetic: bts-trx: document variable power level + * bts-trx: loops.c: Take into account RSL CHAN ACT ms power level limits + * loops.h: Fix missing include for struct l1sched_trx + * power_control.c: Take into account RSL CHAN ACT ms power level limits + * cosmetic: l1sap.c: Fix typo + * rsl: Assign recv pwr to lchan's max ms power + * bts-trx: Implement MS Power control loop calculations using dBm instead of ctl levels + * rsl: Fix logged value in rx MS Power Control + * cosmetic: Fix trailing whitespace + * Change gsm_bts_trx field to bool and rename it + * Change gsm_lchan field fixed to bool + * rsl: Remove unneeded duplicate reset on some lchan fields + * Move and rename gsm_lchan.ms_power field + * bts-trx: loops.c: Avoid always clamping MS power to MS power class 1 + * power_control.c: Apply latests improvements from loops.c + * power_control.c: Log rx current and target signal levels + * power_control.c: Fix ms pwr ctrl skipped if MS doesn't support announced MS Power Level + * Introduce BTS feature BTS_FEAT_MS_PWR_CTRL_DSP + * power_control.c: Don't use announced MS Power level as input for loop calculations + * power_control.c: Limit speed of announced MS Power Level value changes + * scheduler_trx.c: cast ptrdiff value to fix printf format + * bts-trx: Drop low layer MS Power Control Loop algo + * rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER + * rsl: Clarify when autnonoums MS Power Ctrl Loop is used + * power_control.c: Log maximum allowed MS Power Level + * power_control.c: Clarify loop algo vars and use correct ones during log + * l1sap: is_fille_frame(): verify len of data compared + + [ Martin Hauke ] + * Fix common misspellings and typos + * Rename variable: CALIB_SUCESS -> CALIB_SUCCESS + + [ Philipp Maier ] + * scheduler_trx: use gsm0502_fn_remap() to calculate frame number + * scheduler_trx: initalize n_errors, n_bursts_bits, n_bits_total + * scheduler_trx.c: avoid division by zero when calculating BER + * rsl: ensure measurement reports are sent + * l1sap.c: ensure ms power control loop is running + + -- Pau Espin Pedrol Fri, 03 Jan 2020 17:18:44 +0100 + osmo-bts (1.1.0) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id132c615f7398402ac20d179e5917bea58ef3334 Gerrit-Change-Number: 16718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:45:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:45:41 +0000 Subject: Change in libosmocore[master]: bitvec: Fix return value in doc for bitvec_write_field() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16719 ) Change subject: bitvec: Fix return value in doc for bitvec_write_field() ...................................................................... bitvec: Fix return value in doc for bitvec_write_field() Change-Id: I629e71242cb6bafa3c1b1d65ae7ec6687ec203d1 --- M src/bitvec.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/16719/1 diff --git a/src/bitvec.c b/src/bitvec.c index 0c263ad..ef8621c 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -497,7 +497,7 @@ * \param[in] bv The boolean vector to work on * \param[in,out] write_index Where writing supposed to start in the vector * \param[in] len How many bits to write - * \returns next write index or negative value on error + * \returns 0 on success, negative value on error */ int bitvec_write_field(struct bitvec *bv, unsigned int *write_index, uint64_t val, unsigned int len) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I629e71242cb6bafa3c1b1d65ae7ec6687ec203d1 Gerrit-Change-Number: 16719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:45:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:45:42 +0000 Subject: Change in libosmocore[master]: gb: Fix typo in bssgp_cause_strings description References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16720 ) Change subject: gb: Fix typo in bssgp_cause_strings description ...................................................................... gb: Fix typo in bssgp_cause_strings description Change-Id: I2474bbe99bf0aa35aab046a1987047a8368beff6 --- M src/gb/gprs_bssgp_util.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/16720/1 diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c index 669dfb8..7708949 100644 --- a/src/gb/gprs_bssgp_util.c +++ b/src/gb/gprs_bssgp_util.c @@ -43,7 +43,7 @@ static const struct value_string bssgp_cause_strings[] = { { BSSGP_CAUSE_PROC_OVERLOAD, "Processor overload" }, { BSSGP_CAUSE_EQUIP_FAIL, "Equipment Failure" }, - { BSSGP_CAUSE_TRASIT_NET_FAIL, "Transit netowkr service failure" }, + { BSSGP_CAUSE_TRASIT_NET_FAIL, "Transit network service failure" }, { BSSGP_CAUSE_CAPA_GREATER_0KPBS, "Transmission capacity modified" }, { BSSGP_CAUSE_UNKNOWN_MS, "Unknown MS" }, { BSSGP_CAUSE_UNKNOWN_BVCI, "Unknown BVCI" }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2474bbe99bf0aa35aab046a1987047a8368beff6 Gerrit-Change-Number: 16720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:55:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:55:03 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 to look at the new patch set (#4). Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Pass paging group instead of imsi where later is not needed Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h M src/tbf.cpp M src/tbf_dl.cpp 9 files changed, 54 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/16672/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 16:55:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 16:55:03 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 to look at the new patch set (#5). Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Allow Gb PAGING-PS without P-TMSI P-TMSI is optional IE, but IE is mandatory and hence always available. Since the encoding is actually a Mobile Identity, the IMSI is used in case P-TMSI is not available. Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 --- M src/encoding.cpp M src/encoding.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 5 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/16536/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:06:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:06:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:06:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:11:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 17:11:35 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:11:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:14:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jan 2020 17:14:30 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:25:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:25:25 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E43-e1f08-dirty_=E2=86=92_1=2E6=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16721 ) Change subject: Bump version: 1.5.0.43-e1f08-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.43-e1f08-dirty ? 1.6.0 Change-Id: I21556570e35d662bb902d5c1afc911b82d5eb1e6 --- M configure.ac M debian/changelog M debian/control 3 files changed, 68 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/16721/1 diff --git a/configure.ac b/configure.ac index 66492f5..2a48743 100644 --- a/configure.ac +++ b/configure.ac @@ -44,15 +44,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index 8c9cde0..b65bc0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-bsc (1.6.0) unstable; urgency=medium + + [ Philipp Maier ] + * bsc_msc_data: remove unused member is_authenticated + * gsm_08_08.c: always pick first msc for unsolicit paging responses + + [ Neels Hofmeyr ] + * add vty 'no neighbors' to remove all HO targets + * neighbor config: allow re-using ARFCN+BSIC pairs + * fsm: use deferred deallocation + + [ Vadim Yanitskiy ] + * abis_nm.c: use LOGP() macro instead of LOGPC() + * lchan_select.c: tune log level in lchan_select_by_type() + * VTY: also print the active phan config in ts_dump_vty() + * osmo_bsc_main.c: verify the physical channel mapping at startup + * osmo_bsc_main.c: simplify computation of CCCH_CONFIG + * osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config + * abis_nm.c: fix error message in verify_chan_comb() + * abis_nm.c: replace magic numbers with NM_CHANC_* constants + * abis_nm.c: fix RSL connection timeout for trx->nr > 0 + + [ Harald Welte ] + * Cell Broadcast: CBSP and CBCH scheduling support + * doc: update bsc_vty_reference.xml + * manual: Update statements regarding SCCPlite + * SMSCB: Send ETWS primary warning message via all dedicated channels + * SMSCB: Send ETWS Primary Notifiation via RSL to BTS + * check for osmo_fsm_register() error return value + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * Move a_reset_fsm regstration to __attribute__((contructor)) + * exit(2) on unsupported positional arguments on command line + * gsm_04_80: Avoid using deprecated API + + [ Pau Espin Pedrol ] + * a_reset.c: Don't wait 2 seconds to send first BSSMAP RESET + * bsc: gsm_08_08.c: Remove repeated conn not null check + * bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed during WAIT_CC + * gsm_08_08.c: Mark func bsc_find_msc() static + * sigtran: Set default remote ip to localhost instead of null + * bsc_vty: Fix typo in 'no depends-on-bts' cmd + * rsl: Send IE MS Power Param during CHAN ACT and MS PWR CTRL messages + * rsl.c: Clean up some repeated use of long chains of pointers + * rsl: Send IE MS Power Param to osmocom BTS models only + * Remove unused API classmark_is_r99() + * gsm_data.h: Remove unused field classmark from gsm_subscriber_connection + * gsm_data.h: Remove unused func declarations + * bsc: Adapt maximum MS Power Ctrl level based on band and MS Power class + * cosmetic: bs11_config: clean trailing whitespace + * bsc: Send MS Power Control msg upon max MS power change + + [ Martin Hauke ] + * Fix some typos + + [ Oliver Smith ] + * doc: osmux: use generated svg instead of pychart + * debian, osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 18:24:51 +0100 + osmo-bsc (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 93b8a55..5a18c2e 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ python3-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 1.2.0), + libosmocore-dev (>= 1.3.0), libosmo-sccp-dev (>= 0.10.0), libosmo-sigtran-dev (>= 0.10.0), libosmo-abis-dev (>= 0.6.0), libosmo-netif-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.5.0), + libosmo-mgcp-client-dev (>= 1.6.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I21556570e35d662bb902d5c1afc911b82d5eb1e6 Gerrit-Change-Number: 16721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:39:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:39:47 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E16-6413a-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16707 ) Change subject: Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 Gerrit-Change-Number: 16707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:39:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:40:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:40:29 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E8-4c2c-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16706 ) Change subject: Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 Gerrit-Change-Number: 16706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:40:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:40:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:40:33 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E8-4c2c-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16706 ) Change subject: Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 ...................................................................... Bump version: 0.7.0.8-4c2c-dirty ? 0.8.0 Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 --- M TODO-RELEASE M debian/changelog M src/Makefile.am 3 files changed, 21 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 4fe42c6..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-abis struct ipa_client_conn Fields added at the end (no ABI break because instance is created through API func) -libosmo-abis ipa_client_conn_create2() New API added diff --git a/debian/changelog b/debian/changelog index db17338..68064ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libosmo-abis (0.8.0) unstable; urgency=medium + + [ Alexander Couzens ] + * ipa: ipa_server_link_close() add checks of link state + + [ Pau Espin Pedrol ] + * ipa: Allow setting local addr and port for struct ipa_client_conn + + [ Harald Welte ] + * dahdi: Use ioctl(DAHDI_SPECIFY) instead of legacy /dev/dahdi/%u + * Enable DAHDI support by default; require --disable-dahdi otherwise + + [ Vadim Yanitskiy ] + * input/ipaccess.c: propagate errors from ipa_parse_unitid() + * input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET + * e1_input.c: make reference counting get() / put() more verbose + * input/ipa_keepalive.c: make sure IPA keepalive FSM is registered + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:53:32 +0100 + libosmo-abis (0.7.0) unstable; urgency=medium [ Max ] diff --git a/src/Makefile.am b/src/Makefile.am index 9c438c9..5ae94e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=7:0:1 +ABIS_LIBVERSION=8:0:2 TRAU_LIBVERSION=4:0:2 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7099f91a3610d61d16e769406ac27f54e7363f3 Gerrit-Change-Number: 16706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:41:05 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E16-6413a-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16707 ) Change subject: Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 ...................................................................... Bump version: 0.6.0.16-6413a-dirty ? 0.7.0 Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control M src/Makefile.am 5 files changed, 28 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index b7cb070..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif stream osmo_sock_init2_multiaddr() is used, requires libosmocore > 1.2.0 (to be released) diff --git a/configure.ac b/configure.ac index 66ec57f..7af10ec 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,8 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) diff --git a/debian/changelog b/debian/changelog index b3aba59..c4f664b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +libosmo-netif (0.7.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * stream: Introduce API osmo_stream_cli_is_connected + * stream: Fix scheduling of queued messages during connecting state + * stream_test: Use fake time + * stream_test: Log fake time + * osmux: osmux_snprintf(): Append comma between osmux frames in msg + * osmux: osmux_snprintf(): Remove dangling whitespace at the end of dummy frames + * tests: osmux_test: Use fake time also for monotonic clock + * osmux: squash LOGP message to one line + * tests: osmux_test: Provide More accurate logging expectancies + * stream.c: remove duplicated line setting variable + * stream: osmo_stream_srv_link: Support setting multiple addr + * stream: osmo_stream_cli: Support setting multiple addr + * tests: osmux_test: Hardcode h_output values set by random() + * stream: Fix fd param passed to close() in error conditon + * libosmo-netif.pc.in: Append -lsctp to Libs.private + + [ Neels Hofmeyr ] + * osmux_test: don't use color logging + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:01:22 +0100 + libosmo-netif (0.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index e1b2096..6cec7e5 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ libdpkg-perl, git, doxygen, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.3.0), libosmo-abis-dev (>= 0.6.0), pkg-config, libpcap0.8-dev, diff --git a/src/Makefile.am b/src/Makefile.am index 7acbd79..64fd1d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=8:0:0 +LIBVERSION=9:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iabfa9a706c6456bf554ba59badbc3cbfc9210423 Gerrit-Change-Number: 16707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:42:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:42:42 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E32-bd8f-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 ) Change subject: Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 Gerrit-Change-Number: 16705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:42:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:42:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:42:46 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E32-bd8f-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 ) Change subject: Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.32-bd8f-dirty ? 1.5.0 Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libgtp6.install M debian/rules M gtp/Makefile.am 6 files changed, 50 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 73e3189..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp queue.h struct qmsg_t got a new field: entry -libgtp pdp.h struct pdp_t got a new field: qmsg_list_req diff --git a/debian/changelog b/debian/changelog index 921875a..6b8a313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +osmo-ggsn (1.5.0) unstable; urgency=medium + + [ Jan Engelhardt ] + * build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST + + [ Pau Espin Pedrol ] + * libgtp: Remove packets in tx queue belonging pdp being freed + * libgtp: announce pdp ctx deletion upon CreatePdpCtx being rejected + * Introduce in46a_is_v{4,6}() helpers + * ggsn: Move PCO handling code into its own file + * in46_addr: Improve in46a_ntop documentation + * ggsn_vty.c: Fix wrong use of in46a_from_eua, print IPv6 euas + * ggsn: Split application lifecycle related code into ggsn_main.c + * Move pdp_get_peer_ipv() to lib/util.* + * gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas + * Introduce LOGTUN log helper + * ggsn_vty.c: Avoid printing duplicates for pdp context with v4v6 EUAs + * pdp: constify param in pdp_count_secondary() + * ggsn_vty.c: Improve output of VTY show pdp-context + * doc: Update vty reference xml file + * libgtp: Introduce cb_recovery3 + * ggsn: Implement echo req/resp and recovery + * cosmetic: fix formatting in if line + * gtp: Log msg retransmits and timeouts + * cosmetic: gtp: Drop commented out code calling pdp_freepdp() + * cosmetic: gtp: Improve documentation of gtp_delete_context_req2() + * ggsn: rx DeletePdpReq confirmation: Improve documentation and use gtp_freepdp() + * gtp: Manage queue timers internally + * ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs + + [ Vadim Yanitskiy ] + * gtp_update_pdp_ind(): fix NULL-pointer dereference + * gtp_error_ind_conf(): fix: guard against an unknown GTP version + * gtp/gtp.c: cosmetic: use get_tid() where we need TID + * manuals/configuration.adoc: fix Network Address without prefix length + * manuals/configuration.adoc: fix IPv4 address mismatch in <> + * contrib/systemd: add systemd-networkd examples from manuals + + [ Harald Welte ] + * sgsnemu: Fix null-pointer format string argument + * manual: Fix copy+paste error + + -- Pau Espin Pedrol Thu, 02 Jan 2020 20:39:39 +0100 + osmo-ggsn (1.4.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 9a5ed58..a07bdca 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp5 +Package: libgtp6 Architecture: any Multi-Arch: same Section: libs @@ -42,7 +42,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp5 (= ${binary:Version}) + libgtp6 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -55,7 +55,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp6 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -66,7 +66,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp5 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp6 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp5.install b/debian/libgtp6.install similarity index 100% rename from debian/libgtp5.install rename to debian/libgtp6.install diff --git a/debian/rules b/debian/rules index cdb2480..c5c7708 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp5 --dbg-package=libgtp-dbg + dh_strip -plibgtp6 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 20255f7..a392277 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=5:0:0 +LIBVERSION=6:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I84bbe9eff37e14985b812b49e53eb6d62fff14a5 Gerrit-Change-Number: 16705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:52:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:52:03 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E72-6e72-dirty_=E2=86=92_1=2E6=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16722 ) Change subject: Bump version: 1.5.0.72-6e72-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.72-6e72-dirty ? 1.6.0 Change-Id: I315ba8c67fbb5bec520f1bc42aedd25d47e4ca95 --- M configure.ac M debian/changelog M debian/control 3 files changed, 101 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/16722/1 diff --git a/configure.ac b/configure.ac index b5cd594..b515732 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS diff --git a/debian/changelog b/debian/changelog index ec9671c..6f50642 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,97 @@ +osmo-msc (1.6.0) unstable; urgency=medium + + [ Philipp Maier ] + * cosmetic: make function mncc_tx_to_gsm_cc static + * sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return + * msc_a: switch RAN type back to SGs when a CSFB-Call is cleared + * sgs_iface: Accept messages with unknown TLV elements + * paging: Send SGsAP-SERVICE-ABORT-REQUEST on paging timeout + + [ Neels Hofmeyr ] + * add 'encryption uea 1 2' cfg / fix ttcn3 iu tests + * mncc: send payload type matching chosen codec + * memleak on cc setup errors + * cc trans: make sure bearer cap is empty + * fix segfault: don't send CC REL on NULL msc_a + * vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD + * tweak CC cause for incoming call to unattached nr + * log, cosmetic: add "RR" to "Ciphering Mode Complete" + * msc_vlr_tests: GSUP: don't care about extra IEs + * gsm48_tch_rtp_create(): check against NULL mgcp_info + * msc_a.c, CC trans: change a comment to a debug log + * cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. + * vlr: don't log about "gratuitous ID RESPONSE" + * ran_dec logging: log message sizes on errors + * msc_a fsm: ignore state chg to same state + * fix error on BSSMAP Cipher Mode Complete L3 msg IE + * catch GSUP auth result without auth_fsm + * LOG_TRANS for CC: always log CC state + * log which DTAP messages are sent to RAN + * log: drop duplicate MNCC log + * also log MNCC_SETUP_REQ + * BSSMAP log tweak + * log: RANAP encode: use RANAP message names instead of BSSAP + * log: ran_msg_a: tweak a message name + * send MNCC REL only if MNCC has actually started + * fsm: use deferred deallocation + * rtp_stream: sanely cancel MGW endpoint FSM notify + * use osmo_sockaddr_str_is_nonzero() + * CC: add error handling for CRCX responses + * add msc_log_to_ladder.py + * charts: add full MO and MT voice call diagram + * cc trans: remove unused tch_rtp_create + * fix msc_vlr_test_call.c + * BSSMAP: decode Codec List (BSS Supported) + * fail on invalid RTP address from MGW + * msc_a CC: add some basic sanity tests + * fix incoming call while Paging + * add sdp_msg API: SDP parsing/composition + * MNCC v6: add optional SDP to the socket protocol + * msc_vlr_tests: better err logging for dtap msgs + * msc_vlr_test_call.c: add MNCC logging + * msc_vlr_tests: log descriptions in color with -v + * msc_vlr_test_call: rename lu_utran_tmsi + * gsup: indicate CN-Domain in SendAuthInfo Requests + * sms db: when storing an SMS, retrieve the ID + * sms log tweak + + [ Vadim Yanitskiy ] + * libvlr/vlr.c: cosmetic: move message_type assignment + * counters: clarify documentation for MSC_CTR_SMS_* entries + * counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries + * counters: clarify documentation for MSC_CTR_CALL_* entries + * counters: polish documentation of cm_service_request / paging_resp + * libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO + * libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() + * libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP + + [ Alexander Couzens ] + * smpp_openbsc.c: check acl before deref it + * vlr: gmm_cause_to_fsm_and_mm_cause() drop fsm_cause_p argument + * make vlr_gmm_cause_to_mm_cause public + * vlr_auth_fsm: on SAI use the GSUP provided GMM cause code + + [ Keith Whyte ] + * Implement a global switch on the network to disable call waiting. + + [ Pau Espin Pedrol ] + * vty: fix access to wrong argv in paging response-timer + + [ Oliver Smith ] + * tests: only check IU configs if IU is enabled + * osmoappdesc.py, tests: switch to python 3 + + [ Martin Hauke ] + * Fix some typos + + [ Harald Welte ] + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * Check for osmo_fsm_register() error return value + * msc: exit(2) on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 18:51:37 +0100 + osmo-msc (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index f7a336a..2725764 100644 --- a/debian/control +++ b/debian/control @@ -15,11 +15,11 @@ libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), - libosmocore-dev (>= 1.2.0), + libosmocore-dev (>= 1.3.0), libosmo-sccp-dev (>= 1.1.0), libosmo-sigtran-dev (>= 1.1.0), libosmo-abis-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-mgcp-client-dev (>= 1.7.0), libosmo-gsup-client-dev (>= 1.0.0), libosmo-netif-dev (>= 0.6.0), libosmo-ranap-dev (>= 0.3.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I315ba8c67fbb5bec520f1bc42aedd25d47e4ca95 Gerrit-Change-Number: 16722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:53:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:53:24 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E71-bb75-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 ) Change subject: Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 Gerrit-Change-Number: 16709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:53:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:53:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:53:27 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E71-bb75-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 ) Change subject: Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.71-bb75-dirty ? 1.2.0 Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-sigtran5.install M debian/rules M src/Makefile.am 7 files changed, 101 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 37a636e..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-sigtran osmo_ss7_asp_peer ABI breakage (host is now an array of strings) -libosmo-sigtran osmo_ss7_as ABI breakage (added field last_asp_idx_sent) -libosmo-sigtran osmo_ss7_as ABI breakage (added field mode_set_by_vty) diff --git a/configure.ac b/configure.ac index 25ff832..11b5fe8 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 5fb9cb0..2b14542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,91 @@ +libosmo-sccp (1.2.0) unstable; urgency=medium + + [ Kira Obrezkova ] + * systemd: This patch adds Documentation field to the systemd service file + + [ Alexander Couzens ] + * osmo_sccp_simple_client(): use sccp instance index 0 instead of 1 + * sccp_user: correct comment for osmo_sccp_simple_client + + [ Pau Espin Pedrol ] + * ss7: Do not queue messages if stream is not connected + * Fix typo in log message of recent commit + * m3ua: Log incorrect selected AS + * Defer xua server binding until exit of VTY node + * ss7: Support multiple addresses in SCTP connections + * ss7: Log local and remote address set upon ASP restart + * tests: Introduce test for multi-homing STP features + * cosmetic: ss7: Fix trailing whitespace + * vty: Fix write-config of local-ip and remote-ip commands + * cosmetic: Fix trailing whitespace + * ss7: Fix osmo_ss7_asp_peer_snprintf() output if peer has zero IP addr assigned + * ss7: Fix finding asp by socket addr if local ip addr is 0.0.0.0 + * ss7: Fix finding asp by socket addr if it has no remote hosts configured + * vty: ss7: Make sure ASP has at least INET_ANY addr set if not configured in VTY + * vty: Print traffic mode during show cs7 instance as + * ss7: Set default traffic-mode to override + * ss7: Implement AS traffic mode loadshare using round robin ASP selection + * ss7: Set configured AS traffic mode when sending Routing Key Register msg + * ss7: Only override traffic mode from recv REG REQ if not set by VTY + * xua: Verify all route ctxs received in ASPAC msg + * ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if known + * xua: Allow traffic mode set by peer if not set by VTY + * xua: Fix private function name + * xua: loadshare: select ASP for tx only if active + * xua: Reset AS traffic mode set by peer during shutdown + * xua: Select only active ASPs during tx in Override traffic mode + * xua: On new ASPAC, set and notify other ASPs as inactive + * ss7: Set ASP default remote addr to 127.0.0.1 if none set in VTY + * xua: Don't send NOTIFY messages to IPA ASPs + * xua: ipa_asp_fsm: Allow moving ASP to inactive state + * xua: ipa_asp_fsm: Allow receiving IPA ID ACK before IPA ID RESP + * ss7: Improve log formatting during ASP restart + * ss7: Set correct local addr and port during dynamic ASP creation + * xua: Avoid multiline log in xua_msg_dump() + * xua: Implement traffic mode broadcast + * debian: Drop patches directory containing old patch not longer required + + [ Harald Welte ] + * Move definition of LOGSS7() to header file; add LOGPAS() like LOGPASP() + * Use LOGPAS / LOGPASP in favor of generic LOGSS7 where applicable + * ipa: Don't send non-SCCP data over IPA/SCCPlite + * ipa: Fix crash when parsing of received IPA SCCP message fails + * ipa: VTY config option to explicitly enable/disable SCCP patching + * Don't permit routing-context != 0 for IPA peers + * cosmetic: Document why IPA uses hard-coded routing-context 0 + * Log correct protocol during xua_accept_cb() + * xua_rkm: Print NOTICE log message if registration for wrong rctx + * xua_rkm: Don't permit de-registration of rctx with ASP active + * xua_asp_fsm: Don't send M3UA ERR and then send ASPAC_ACK + * M3UA: Reject ASP activation + RKM registration for incompatible traffic-mode + * introduce public enum osmo_ss7_asp_role for ASP/SG/IPSP + * Allow ASP role to be configured + * vty: Permit configuration of ASPs in SCTP client mode + * Don't forget to store the sctp-role during writing config file + * osmo_ss7: Add osmo_ss7_asp_find() + * asp: Don't override ASP and SCTP role when re-entering asp node + * fix generating asp-role that can be parsed when re-opening config file + * Skip dynamic ASPs when writing the list of ASPs in an AS + * check for osmo_fsm_register() failures and propagate error + * xua_asp_fsm: Ensure xUA client includes traffic-mode if configured + * xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA + * stp: exit(2) on unsupported positional arguments on command line + * ASP FSM: Permit DOWN -> DOWN "transition" + * ASP: Stop re-transmitting un-acknowledged messages on SCTP down event + + [ Vadim Yanitskiy ] + * osmo_ss7.c: cosmetic: fix typo in xua_accept_cb() + * osmo_ss7.c: fix copy-paste error in xua_accept_cb() + * osmo_ss7.c: fix xua_accept_cb(): properly assign role + * tests/sccp/Makefile.am: use sccp.o from $(top_builddir) + * osmo_ss7_vty.c: implement 'active' filter for show_cs7_as_cmd + + [ Oliver Smith ] + * gitignore: add various generated doc files + * osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Thu, 02 Jan 2020 21:24:11 +0100 + libosmo-sccp (1.1.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 3417297..fe622e0 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.3.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev (>= 0.4.0), + libosmo-netif-dev (>= 0.7.0), libsctp-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.7 @@ -34,7 +34,7 @@ . This package contains the development files for the library. -Package: libosmo-sigtran3 +Package: libosmo-sigtran5 Section: libs Architecture: any Multi-Arch: same @@ -53,7 +53,7 @@ Architecture: any Section: debug Multi-Arch: same -Depends: libosmo-sigtran3 (= ${binary:Version}), +Depends: libosmo-sigtran5 (= ${binary:Version}), ${misc:Depends} Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -68,7 +68,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmo-sigtran3 (= ${binary:Version}), + libosmo-sigtran5 (= ${binary:Version}), libjs-jquery Description: Documentation for the Osmocom SIGTRAN library libosmo-sigtran is a shared library containing SS7/SIGTRAN related functionality, @@ -83,7 +83,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmo-sigtran3 (= ${binary:Version}), + libosmo-sigtran5 (= ${binary:Version}), libosmocore-dev, libosmo-netif-dev Description: Development headers for the Osmocom SIGTRAN library @@ -98,7 +98,7 @@ Architecture: any Multi-Arch: same Section: net -Depends: libosmo-sigtran3, +Depends: libosmo-sigtran5, ${shlibs:Depends}, ${misc:Depends} Description: Osmocom SIGTRAN STP (Signaling Transfer Point) diff --git a/debian/libosmo-sigtran3.install b/debian/libosmo-sigtran5.install similarity index 100% rename from debian/libosmo-sigtran3.install rename to debian/libosmo-sigtran5.install diff --git a/debian/rules b/debian/rules index a8eeff5..9c27539 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ dh $@ --with autoreconf override_dh_strip: - dh_strip -plibosmo-sigtran3 --dbg-package=libosmo-sigtran-dbg + dh_strip -plibosmo-sigtran5 --dbg-package=libosmo-sigtran-dbg dh_strip -posmo-stp --dbg-package=osmo-stp-dbg override_dh_install: diff --git a/src/Makefile.am b/src/Makefile.am index bdb225b..4ef753c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=4:0:1 +LIBVERSION=5:0:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibab643b971f80e3774c393ff3988a765dc081196 Gerrit-Change-Number: 16709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:54:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:54:35 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E30-832bc-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16714 ) Change subject: Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 Gerrit-Change-Number: 16714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:54:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:54:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:54:37 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E30-832bc-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16714 ) Change subject: Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.30-832bc-dirty ? 1.7.0 libosmocore required version increased due to include used from libosmo-netif including an include from libosmocore which in previous versions misses including an include from a symbol used. Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 --- M configure.ac M debian/changelog M src/libosmo-mgcp-client/Makefile.am 3 files changed, 46 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 124f1e6..c74526b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,9 +39,9 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/changelog b/debian/changelog index 2259eac..fe31733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +osmo-mgw (1.7.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * rename codecs_cmp() to codecs_same() + * mgcp_codec: constify 'param' arg + * fix crashes: don't assert on incoming RTP packet size + * mgcp_send(): stop looping on conversion error + * mgcp_codec: split codec_free() off of codec_init() + * fix memleak: actually free strings in mgcp_codec_reset_all() + * mgcp_test: extend / rewrite test_mgcp_codec_pt_translate() + * test_mgcp_codec_pt_translate(): more tests + * differentiate AMR octet-aligned=0 vs =1 + * ptmap: implicitly match '/8000' and '/8000/1' + * mgcp_codec: codec_set(): log about all possible errors + * mgcp_codec_add: fix audio_name size check + * explicitly free codecs in mgcp_rtp_conn_cleanup() + * tweak mgcp_parse_audio_ptime_rtpmap() + * SDP: store all ptmap entries + * mgcp_client_fsm cleanup: Do not assert on DLCX failure + * clear pending requests on MGCP failure + * client: endp fsm: add notify struct, prep for cancel-notify + * client: endp fsm: clear ci[] before dispatching DLCX success + * client: endp fsm: allow cancelling a notify event + * client: endp fsm: add osmo_mgcpc_ep_ci_ep() + * accept MGCP without SDP + * fix use-after-free: require new fsm deferred dealloc, check for term + + [ Pau Espin Pedrol ] + * mgcp_test: Correctly release all endpoints allocated + * mgw: Allocate mgcp_conn instance under tcfg->endpoints + + [ Harald Welte ] + * manual: Fix copy+paste error + * mgcp_client: Check for osmo_fsm_register() error return value + * Move fsm_mgcp_client regstration to __attribute__((contructor)) + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * osmoappdesc.py: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 13:35:09 +0100 + osmo-mgw (1.6.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 8f5513a..61b7822 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=6:0:0 +MGCP_CLIENT_LIBVERSION=7:0:1 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1d5f14b1ad36b2ed94343fca71fdc622424403d3 Gerrit-Change-Number: 16714 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:59:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:59:15 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E23-11a1_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16717 ) Change subject: Bump version: 0.5.0.23-11a1 ? 0.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5f42c0ad1a930004415f097d984e1fd1b2d277e6 Gerrit-Change-Number: 16717 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 17:59:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 17:59:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 17:59:18 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E5=2E0=2E23-11a1_=E2=86=92_0=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16717 ) Change subject: Bump version: 0.5.0.23-11a1 ? 0.6.0 ...................................................................... Bump version: 0.5.0.23-11a1 ? 0.6.0 Change-Id: I5f42c0ad1a930004415f097d984e1fd1b2d277e6 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmo-ranap3.install M debian/rules M src/Makefile.am 6 files changed, 44 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index b967e56..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libranap iu_client.h struct ranap_ue_conn_ctx: add field notification -libranap iu_client.h struct ranap_ue_conn_ctx: add field release_timeout -libranap iu_client.h struct ranap_ue_conn_ctx: add field free_on_release diff --git a/debian/changelog b/debian/changelog index cdf7a94..f59c49e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +osmo-iuh (0.6.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * hnbgw_vty.c: fix: properly pass pointer to g_hnb_gw + * osmo-hnbgw: make sure osmo_ss7_init() executed successfully + + [ Alexander Couzens ] + * iu_client: sccp_sap_up: set rc early + * iu_client: ensure UE is not NULL on CO primitives + * iu_client: sccp_sap_up: don't decode empty disconnect indications + * iu_client: introduce ranap_iu_free_ue() to free the UE connections + * iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication + * iu_client: introduce a guard around global_iu_event_cb + * iu_client: allow to control the notifications + * iu_client: introduce ranap_iu_tx_release_free() + * iu_client: introduce UE field free_on_release + * iu_client: pass return value of osmo_sccp_user_sap_down() towards the caller + * iu_client: ranap_iu_tx_release() change default cause code to Success + + [ Pau Espin Pedrol ] + * hnbgw: Add libosmoctrl's VTY CTRL command initialization + * debian/rules: Fix dbg pacakges + * debian: Split libosmo-sabp from libosmo-ranap package + + [ Harald Welte ] + * asn1enum.pl: Make compatible with modern perl + * sabp: Initial import of SABP ASN.1 from 3GPP TS 25.419 V11.1.0 (2013-03) + * sabp: fixup SABP ASN.1 to avoid IOC (which are not supported by our toolchain) + * sabp: Add Procedure Codes and IEI constants to CommonDataTypes + * sabp: Generate C/H files for SABP; create libosmo-sabp + * Initial minimal OsmoHNBGW user manual + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * gitignore: add gen_sabp.stamp + * debian, asn1tostruct.py: switch to python3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 17:04:15 +0100 + osmo-iuh (0.5.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index c6e0714..4d66d18 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Depends: osmo-hnbgw (= ${binary:Version}), ${misc:Depends} Description: osmocom Home Node B Gateway -Package: libosmo-ranap2 +Package: libosmo-ranap3 Section: libs Architecture: any Multi-Arch: same @@ -48,14 +48,14 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-ranap-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-sabp0 diff --git a/debian/libosmo-ranap2.install b/debian/libosmo-ranap3.install similarity index 100% rename from debian/libosmo-ranap2.install rename to debian/libosmo-ranap3.install diff --git a/debian/rules b/debian/rules index e821a57..c3bdf50 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: - dh_strip -plibosmo-ranap2 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/src/Makefile.am b/src/Makefile.am index b1f8153..1c3a64a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ # build the shared RANAP + SABP library # -RANAP_LIBVERSION=2:2:0 +RANAP_LIBVERSION=3:0:0 SABP_LIBVERSION=0:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5f42c0ad1a930004415f097d984e1fd1b2d277e6 Gerrit-Change-Number: 16717 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:00:44 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E26-276c-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16711 ) Change subject: Bump version: 1.1.0.26-276c-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5778895237511c62903784e8bed6920ecf058a50 Gerrit-Change-Number: 16711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 18:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:00:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:00:48 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E26-276c-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16711 ) Change subject: Bump version: 1.1.0.26-276c-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.26-276c-dirty ? 1.2.0 Change-Id: I5778895237511c62903784e8bed6920ecf058a50 --- M configure.ac M debian/changelog 2 files changed, 46 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index d39edb2..334a7e8 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 0b89abe..1b02a20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +osmo-hlr (1.2.0) unstable; urgency=medium + + [ Ruben Undheim ] + * Fix test for return codes on mipsel and alpha archs + + [ Thorsten Alteholz ] + * fix spelling errors detected by lintian + + [ Pau Espin Pedrol ] + * tests: Fix db_test err file to expect error code name instead of value + + [ Oliver Smith ] + * tests/test_nodes.vty: check less libosmocore cmds + * tests/db_upgrade: disable for old sqlite versions + * gitignore: add tests/db_upgrade/*.dump + * gsup_client.h: fix license header: GPLv2+ + * tests/auc: change back to python3 + + [ Neels Hofmeyr ] + * fix double free in osmo_gsup_client_enc_send() + * db upgrade to v2: log version 2, not 1 + * fix upgrade to version 2: imei column default value + * add --db-check option + * hlr.sql: move comment + * add db_upgrade test + * hlr db schema 3: hlr_number -> msc_number + * db.c: code dup: add db_run_statements() for arrays of statements + * move headers to include/osmocom/hlr + * fix upgrade test in presence of ~/.sqliterc + * db upgrade: remove some code dup + * add osmo_gsup_msgb_alloc() + * Makefile convenience: add VTY_TEST var to run only one test + * remove gsup_test + * test_nodes.vty: tweak: add some '?' checks + * db v4: add column last_lu_seen_ps + + [ Harald Welte ] + * AUC: Add support for setting the AMF separation bit to '1' for EUTRAN + * hlr: exit(2) on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 12:37:35 +0100 + osmo-hlr (1.1.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5778895237511c62903784e8bed6920ecf058a50 Gerrit-Change-Number: 16711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:12:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:12:44 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E3=2E2?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/16723 ) Change subject: Bump version: 1.3.1 ? 1.3.2 ...................................................................... Bump version: 1.3.1 ? 1.3.2 Change-Id: I4f7b6c0f18fd1f11e04ae34275645b439d3613fb --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/23/16723/1 diff --git a/debian/changelog b/debian/changelog index ec4e072..e670c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +openbsc (1.3.2) unstable; urgency=medium + + [ Harald Welte ] + * manual: Fix copy+paste error + + [ Oliver Smith ] + * osmoappdesc.py, tests, ipa.py: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:12:23 +0100 + openbsc (1.3.1) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I4f7b6c0f18fd1f11e04ae34275645b439d3613fb Gerrit-Change-Number: 16723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:18:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:18:14 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E91-5997-dirty_=E2=86=92_1=2E6=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 ) Change subject: Bump version: 1.5.0.91-5997-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.91-5997-dirty ? 1.6.0 Change-Id: I99e6950db3f54c6291dd259bed9b5c46cc26c465 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control 4 files changed, 111 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/16724/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index ac6dcb2..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -osmo-sgsn libgtp We dropped libgtp gtp_retranstimeout timer code which became a - no-op in osmo-ggsn.git c94837c6a401bf0f80791b619a9b4cfbe9160afd, - which means next osmo-sgsn release will require libgtp > 1.4.0. diff --git a/configure.ac b/configure.ac index ec7af6e..644a0bd 100644 --- a/configure.ac +++ b/configure.ac @@ -54,14 +54,14 @@ if test "x$osmo_ac_iu" = "xyes" ; then PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.4.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.6.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.5.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index 02ec236..2827f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-sgsn (1.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gprs_gmm: Introduce macros to access msgb's associated IU UE ctx + * gprs_llc.h: Improve documentation of some structs + * gprs_gmm.c: Improve doc on nullable parameters + * gprs_gmm.c: Drop unneeded brackets + * Introduce define TLLI_UNASSIGNED + * gprs_sgsn.c: Warn upon llme free unexpected scenarios + * gprs_gmm: Clarify comment during TLLI assignment + * gprs_sgsn.c: Remove recently introduced assert + * gprs_gmm: Introduce assert to guard against unexpected condition + * gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup + * gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported + * gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static + * sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 + * gprs_gmm.c: Fix typo in log message + * gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type + * Introduce and use log macros when no mm ctx available + * gprs_gmm: Avoid spaces in fsm events and enum strings + * tests: Verify that timers can be set over VTY + * Replace own timer infra with libosmocore osmo_tdef + * tests: Introduce vty-transcript-test tests + * gprs_gmm.c: Use osmo_rai_name() in log line + * examples: Add osmo-sgsn_custom-sccp.cfg + * vty: Introduce cs7-instance-iu + * gprs_gmm.c: Print value_string of reject cause + * gprs_gmm.c: Add spec document to function documentation + * gtp: make echo_interval unsigned + * gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL + * Introduce log helper LOGGGSN and log category DGTP + * sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN + * Move lots of Iu/ranap specific code into its own file + * Move llc->MM/SM Gb specific glue code to its own file + * Split enum gprs_pmm_state into Iu and Gb counterparts + * Merge common allocation steps for Gb and Iu ctx + * gprs_gmm.c: Replace inet_ntoa with inet_ntop + * sgsn_cdr.c: Fix ip addr string buffer size + * sgsn_vty: Fix mmctx rate_ctr output indentation + * sgsn_vty: Print correct Iu mmctx id in 'show mm-context' + * Introduce FSM mm_state_gb_fsm + * Introduce FSM mm_state_iu_fsm + * vty: Print MM state and RAN type in show mm-context + * src/gprs/Makefile.am: Move build of shared .c files to an internal lib + * Move out gbproxy to its own subdir + * Move out gtphub to its own subdir + * Move out sgsn to its own subdir + * gmm: Move code handling GMM Attach Complete to its own function + * gmm: Move code handling GMM Routing Area Update Complete to its own function + * gmm: Move code handling GMM PTMSI Realloc Complete to its own function + * enum gprs_gmm_state: Fix spec reference + * Implement GMM State using osmocom FSM + * Split out GPRS SM layer into its own file + * sgsn: Reject PdpActReq if no GTP pdp ctx exists + * Introduce TODO-RELEASE file + * sgsn_libgtp.c: Drop use of deprecated libgtp APIs gtp_retrans*() + * gmm: Fix assertion hit during RA UPD REQ before completting gmm attach + * Improve logging in gprs_llc.c code + * gprs_llc.c: Use enum instead of hardcoded value + * gprs_gmm.c: Send XID reset with received TLLI + + [ Alexander Couzens ] + * gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY + * gprs_gmm: only update gb/iu cell information when Iu/Gb present + * gprs_gmm: clarify comment of Iu follow-on request + * gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code + * sgsn_pdp_ctx_terminate: check llme before accessing + * gprs_ranap: send CommonId after receiving Security Mode Complete + * mm_gb_fsm: unassign the llme when entering MM_IDLE + * gprs_ranap: refactor REQUIRE_MM define + * sgsn: when receiving data PDU notify the Gb GMM fsm + * Avoid compiling unneeded files when building without Iu + * gprs_ranap: release Iu UE Context when exiting PMM Connected + * Iu: implement a user inactivity timer + * gprs_ranap: on Iu release, stop the attach fsm if running + * gprs_mm_state_gb_fsm: ensure T3350 is not running when entering IDLE + * gprs_ranap: add missing rc = 0 + * gprs_sgsn: always allocate Gb/Iu mm fsm + * sgsn: MM Gb Fsm: fix event handling for implicit detach + * ranap: add non-spec X1001 + * gprs_gmm: release Iu connection on RAU failures + * sgsn_mm_ctx_alloc(): check for unallocated fsms + * sgsn_libgtp: refactor ps paging into gprs_gb + * sgsn: Gb: implementing PS Paging when MS is MM_STANDBY + + [ Vadim Yanitskiy ] + * gprs_mm_state_iu_fsm.c: fix: assign timer_cb to mm_state_iu_fsm + + [ Max ] + * Use libosmocore constant for IMSI length in ACL entry + + [ Harald Welte ] + * LLC: Don't use hard-coded N201-U / N201-I values in XID + * Initial OsmoGbPROXY user manual + * check for osmo_fsm_register() error return values + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * gitignore: fix paths to binaries + * doc: add OsmoGbProxy VTY reference + * regen_doc.sh: support gbproxy, run without docker + * osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:17:56 +0100 + osmo-sgsn (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index df1f070..a37ff65 100644 --- a/debian/control +++ b/debian/control @@ -12,13 +12,13 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.4.0), + libgtp-dev (>= 1.5.0), libosmocore-dev (>= 1.2.0), libosmo-abis-dev (>= 0.6.0), libosmo-netif-dev (>= 0.4.0), libosmo-gsup-client-dev (>= 1.0.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 0.4.0), + libosmo-ranap-dev (>= 0.6.0), libosmo-sigtran-dev (>= 1.0.0), libosmo-sccp-dev (>= 1.0.0), osmo-gsm-manuals-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I99e6950db3f54c6291dd259bed9b5c46cc26c465 Gerrit-Change-Number: 16724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:20:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:20:31 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E43-e1f08-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16721 ) Change subject: Bump version: 1.5.0.43-e1f08-dirty ? 1.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I21556570e35d662bb902d5c1afc911b82d5eb1e6 Gerrit-Change-Number: 16721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 18:20:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:20:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:20:34 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E43-e1f08-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16721 ) Change subject: Bump version: 1.5.0.43-e1f08-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.43-e1f08-dirty ? 1.6.0 Change-Id: I21556570e35d662bb902d5c1afc911b82d5eb1e6 --- M configure.ac M debian/changelog M debian/control 3 files changed, 68 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 66492f5..2a48743 100644 --- a/configure.ac +++ b/configure.ac @@ -44,15 +44,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index 8c9cde0..b65bc0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,64 @@ +osmo-bsc (1.6.0) unstable; urgency=medium + + [ Philipp Maier ] + * bsc_msc_data: remove unused member is_authenticated + * gsm_08_08.c: always pick first msc for unsolicit paging responses + + [ Neels Hofmeyr ] + * add vty 'no neighbors' to remove all HO targets + * neighbor config: allow re-using ARFCN+BSIC pairs + * fsm: use deferred deallocation + + [ Vadim Yanitskiy ] + * abis_nm.c: use LOGP() macro instead of LOGPC() + * lchan_select.c: tune log level in lchan_select_by_type() + * VTY: also print the active phan config in ts_dump_vty() + * osmo_bsc_main.c: verify the physical channel mapping at startup + * osmo_bsc_main.c: simplify computation of CCCH_CONFIG + * osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config + * abis_nm.c: fix error message in verify_chan_comb() + * abis_nm.c: replace magic numbers with NM_CHANC_* constants + * abis_nm.c: fix RSL connection timeout for trx->nr > 0 + + [ Harald Welte ] + * Cell Broadcast: CBSP and CBCH scheduling support + * doc: update bsc_vty_reference.xml + * manual: Update statements regarding SCCPlite + * SMSCB: Send ETWS primary warning message via all dedicated channels + * SMSCB: Send ETWS Primary Notifiation via RSL to BTS + * check for osmo_fsm_register() error return value + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * Move a_reset_fsm regstration to __attribute__((contructor)) + * exit(2) on unsupported positional arguments on command line + * gsm_04_80: Avoid using deprecated API + + [ Pau Espin Pedrol ] + * a_reset.c: Don't wait 2 seconds to send first BSSMAP RESET + * bsc: gsm_08_08.c: Remove repeated conn not null check + * bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed during WAIT_CC + * gsm_08_08.c: Mark func bsc_find_msc() static + * sigtran: Set default remote ip to localhost instead of null + * bsc_vty: Fix typo in 'no depends-on-bts' cmd + * rsl: Send IE MS Power Param during CHAN ACT and MS PWR CTRL messages + * rsl.c: Clean up some repeated use of long chains of pointers + * rsl: Send IE MS Power Param to osmocom BTS models only + * Remove unused API classmark_is_r99() + * gsm_data.h: Remove unused field classmark from gsm_subscriber_connection + * gsm_data.h: Remove unused func declarations + * bsc: Adapt maximum MS Power Ctrl level based on band and MS Power class + * cosmetic: bs11_config: clean trailing whitespace + * bsc: Send MS Power Control msg upon max MS power change + + [ Martin Hauke ] + * Fix some typos + + [ Oliver Smith ] + * doc: osmux: use generated svg instead of pychart + * debian, osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 18:24:51 +0100 + osmo-bsc (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index 93b8a55..5a18c2e 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ python3-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 1.2.0), + libosmocore-dev (>= 1.3.0), libosmo-sccp-dev (>= 0.10.0), libosmo-sigtran-dev (>= 0.10.0), libosmo-abis-dev (>= 0.6.0), libosmo-netif-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.5.0), + libosmo-mgcp-client-dev (>= 1.6.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I21556570e35d662bb902d5c1afc911b82d5eb1e6 Gerrit-Change-Number: 16721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:22:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:22:00 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E72-6e72-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16722 ) Change subject: Bump version: 1.5.0.72-6e72-dirty ? 1.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I315ba8c67fbb5bec520f1bc42aedd25d47e4ca95 Gerrit-Change-Number: 16722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 18:22:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:22:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:22:03 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E72-6e72-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16722 ) Change subject: Bump version: 1.5.0.72-6e72-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.72-6e72-dirty ? 1.6.0 Change-Id: I315ba8c67fbb5bec520f1bc42aedd25d47e4ca95 --- M configure.ac M debian/changelog M debian/control 3 files changed, 101 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b5cd594..b515732 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.7.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS diff --git a/debian/changelog b/debian/changelog index ec9671c..6f50642 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,97 @@ +osmo-msc (1.6.0) unstable; urgency=medium + + [ Philipp Maier ] + * cosmetic: make function mncc_tx_to_gsm_cc static + * sgs_iface: do not use SGsAP-MO-CSFB-INDICATION for CSFB return + * msc_a: switch RAN type back to SGs when a CSFB-Call is cleared + * sgs_iface: Accept messages with unknown TLV elements + * paging: Send SGsAP-SERVICE-ABORT-REQUEST on paging timeout + + [ Neels Hofmeyr ] + * add 'encryption uea 1 2' cfg / fix ttcn3 iu tests + * mncc: send payload type matching chosen codec + * memleak on cc setup errors + * cc trans: make sure bearer cap is empty + * fix segfault: don't send CC REL on NULL msc_a + * vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD + * tweak CC cause for incoming call to unattached nr + * log, cosmetic: add "RR" to "Ciphering Mode Complete" + * msc_vlr_tests: GSUP: don't care about extra IEs + * gsm48_tch_rtp_create(): check against NULL mgcp_info + * msc_a.c, CC trans: change a comment to a debug log + * cosmetic: fix call_leg_ensure_ci() decl. arg name to match impl. + * vlr: don't log about "gratuitous ID RESPONSE" + * ran_dec logging: log message sizes on errors + * msc_a fsm: ignore state chg to same state + * fix error on BSSMAP Cipher Mode Complete L3 msg IE + * catch GSUP auth result without auth_fsm + * LOG_TRANS for CC: always log CC state + * log which DTAP messages are sent to RAN + * log: drop duplicate MNCC log + * also log MNCC_SETUP_REQ + * BSSMAP log tweak + * log: RANAP encode: use RANAP message names instead of BSSAP + * log: ran_msg_a: tweak a message name + * send MNCC REL only if MNCC has actually started + * fsm: use deferred deallocation + * rtp_stream: sanely cancel MGW endpoint FSM notify + * use osmo_sockaddr_str_is_nonzero() + * CC: add error handling for CRCX responses + * add msc_log_to_ladder.py + * charts: add full MO and MT voice call diagram + * cc trans: remove unused tch_rtp_create + * fix msc_vlr_test_call.c + * BSSMAP: decode Codec List (BSS Supported) + * fail on invalid RTP address from MGW + * msc_a CC: add some basic sanity tests + * fix incoming call while Paging + * add sdp_msg API: SDP parsing/composition + * MNCC v6: add optional SDP to the socket protocol + * msc_vlr_tests: better err logging for dtap msgs + * msc_vlr_test_call.c: add MNCC logging + * msc_vlr_tests: log descriptions in color with -v + * msc_vlr_test_call: rename lu_utran_tmsi + * gsup: indicate CN-Domain in SendAuthInfo Requests + * sms db: when storing an SMS, retrieve the ID + * sms log tweak + + [ Vadim Yanitskiy ] + * libvlr/vlr.c: cosmetic: move message_type assignment + * counters: clarify documentation for MSC_CTR_SMS_* entries + * counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries + * counters: clarify documentation for MSC_CTR_CALL_* entries + * counters: polish documentation of cm_service_request / paging_resp + * libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO + * libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() + * libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP + + [ Alexander Couzens ] + * smpp_openbsc.c: check acl before deref it + * vlr: gmm_cause_to_fsm_and_mm_cause() drop fsm_cause_p argument + * make vlr_gmm_cause_to_mm_cause public + * vlr_auth_fsm: on SAI use the GSUP provided GMM cause code + + [ Keith Whyte ] + * Implement a global switch on the network to disable call waiting. + + [ Pau Espin Pedrol ] + * vty: fix access to wrong argv in paging response-timer + + [ Oliver Smith ] + * tests: only check IU configs if IU is enabled + * osmoappdesc.py, tests: switch to python 3 + + [ Martin Hauke ] + * Fix some typos + + [ Harald Welte ] + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * Check for osmo_fsm_register() error return value + * msc: exit(2) on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 18:51:37 +0100 + osmo-msc (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index f7a336a..2725764 100644 --- a/debian/control +++ b/debian/control @@ -15,11 +15,11 @@ libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), - libosmocore-dev (>= 1.2.0), + libosmocore-dev (>= 1.3.0), libosmo-sccp-dev (>= 1.1.0), libosmo-sigtran-dev (>= 1.1.0), libosmo-abis-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-mgcp-client-dev (>= 1.7.0), libosmo-gsup-client-dev (>= 1.0.0), libosmo-netif-dev (>= 0.6.0), libosmo-ranap-dev (>= 0.3.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I315ba8c67fbb5bec520f1bc42aedd25d47e4ca95 Gerrit-Change-Number: 16722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:23:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:23:05 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E95-24e7-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16718 ) Change subject: Bump version: 1.1.0.95-24e7-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id132c615f7398402ac20d179e5917bea58ef3334 Gerrit-Change-Number: 16718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 18:23:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:23:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:23:09 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E95-24e7-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16718 ) Change subject: Bump version: 1.1.0.95-24e7-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.95-24e7-dirty ? 1.2.0 Change-Id: Id132c615f7398402ac20d179e5917bea58ef3334 --- M configure.ac M debian/changelog 2 files changed, 117 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b70d934..1bcd2fe 100644 --- a/configure.ac +++ b/configure.ac @@ -62,12 +62,12 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.2.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) diff --git a/debian/changelog b/debian/changelog index 5cb0f0a..aa3269b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,114 @@ +osmo-bts (1.2.0) unstable; urgency=medium + + [ Oliver Smith ] + * Cosmetic: virtual: l1sap.c: fix typos + * virtual: set link quality for GSMTAP_CHANNEL_RACH + * pcu_sock: fix endian-swapped CellID + * gitignore: add oc2g generated files + * log: set L1 SAPI log context + * vty: add "logging filter l1-sapi" + * vty.c: don't ignore get_string_value() errors + * vty.c: avoid coverity BAD_SHIFT issues + * osmo-bts-virtual.cfg: ms-power-control dsp -> osmo + + [ Harald Welte ] + * ETWS Primary Notification via P1 Rest Octets + * pcu_interface: Forward ETWS Primary Notification to PCU + * doc: Update Abis manual RSL section with ETWS related infomration + * osmo-bts-trx/scheduler: prevent uninitialized memory access + * osmo-bts-trx: migrate to new generic ECU abstraction + * rach_pass_filter(): Add information about channel type + + [ Vadim Yanitskiy ] + * common/rsl.c: fix possible NULL-pointer dereference + * osmo-bts-trx/scheduler: fix tx_tch_common(): do not send AMR BFI twice + * osmo-bts-trx/scheduler: add FIXME note about FACCH/H and BFI + * osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() + * scheduler: fix handling of PTCCH/U and PTCCH/D logical channels + * osmo-bts-trx/scheduler: also detect TSC for Access Bursts on PDCH + * common/l1sap: increase ToA precision for packet Access Bursts + * L1SAP: use RSL_CHAN_* definitions from libosmogsm + * L1SAP: also consider RSL_CHAN_OSMO_CBCH8 as CBCH + * L1SAP: clarify debug messages in rach_pass_filter() + * L1SAP: do not pass unused parameter to l1sap_handover_rach() + * L1SAP: refactor handling of Access Bursts on PDCH + * L1SAP: properly handle 11-bit encoded RACH.ind in gsmtap_ph_rach() + * L1SAP: use the actual ARFCN for outgoing PCUIF messages + * L1SAP: fix gsmtap_pdch(): there can be no DATA.ind on PTCCH/U + * L1SAP: use GSMTAP_CHANNEL_PDTCH for PDTCH blocks by default + * L1SAP: there can be no DATA.ind primitives on PTCCH/U, reject them + * README.md: update osmo-bts-trx specific limitations + * osmo-bts-trx/scheduler: fix: print the last frame number in rx_data_fn() + * osmo-bts-trx: general handling of NOPE / IDLE indications + * osmo-bts-trx/trx_if.c: fix: always initialize bi->burst_len for NOPE.ind + * osmo-bts-trx/trx_if.c: also print both RSSI and ToA256 for NOPE.ind + * osmo-bts-trx/trx_if.c: fix: NOPE.ind also contains C/I field + * pcuif_proto.h: extend RACH.ind with TRX and timeslot number fields + * common/vty.c: fix: properly assert() the result of get_string_value() + * common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() + * common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() + * osmo-bts-trx/vty: ensure backwards compatibility with older config files + + [ Pau Espin Pedrol ] + * bts-trx: Log case where no SETFORMAT is sent + * bts-trx: Change super verbose IDLE ind not-supported line to DEBUG + * doc: bts-models.adoc: Fix typos in rts-advance section + * bts-trx: vty: Use API to get poweron state + * bts.h: Remove non-existent function definitions + * scheduler.c: Move some message log level to DEBUG + * scheduler: Use OSMO_ASSERT instead of abort + * l1sap: Log conn dropped due to radio link counter timeout + * struct gsm_bts: Add model_priv pointer handing bts_model specific data + * bts-trx: Allocate struct osmo_trx_clock_state as part of bts-trx private data + * bts-trx: vty: Print phy link state in cmd 'show transceiver' + * bts-trx: trx_set_bts(): Avoid double loop by checking current trx + * bts-trx: Rework code handling poweron state + * bts-trx: Don't reset transceiver_available in scheduler_trx.c + * bts-trx: Get rid of messy transceiver_available state handler + * bts-trx: Drop unused func check_transceiver_availability() + * bts-trx: Log TRXC and TRXD socket recv()/send() failures + * bts-trx: Time out if no clock ind recvd after RSP POWERON + * cosmetic: bts-trx: document variable power level + * bts-trx: loops.c: Take into account RSL CHAN ACT ms power level limits + * loops.h: Fix missing include for struct l1sched_trx + * power_control.c: Take into account RSL CHAN ACT ms power level limits + * cosmetic: l1sap.c: Fix typo + * rsl: Assign recv pwr to lchan's max ms power + * bts-trx: Implement MS Power control loop calculations using dBm instead of ctl levels + * rsl: Fix logged value in rx MS Power Control + * cosmetic: Fix trailing whitespace + * Change gsm_bts_trx field to bool and rename it + * Change gsm_lchan field fixed to bool + * rsl: Remove unneeded duplicate reset on some lchan fields + * Move and rename gsm_lchan.ms_power field + * bts-trx: loops.c: Avoid always clamping MS power to MS power class 1 + * power_control.c: Apply latests improvements from loops.c + * power_control.c: Log rx current and target signal levels + * power_control.c: Fix ms pwr ctrl skipped if MS doesn't support announced MS Power Level + * Introduce BTS feature BTS_FEAT_MS_PWR_CTRL_DSP + * power_control.c: Don't use announced MS Power level as input for loop calculations + * power_control.c: Limit speed of announced MS Power Level value changes + * scheduler_trx.c: cast ptrdiff value to fix printf format + * bts-trx: Drop low layer MS Power Control Loop algo + * rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER + * rsl: Clarify when autnonoums MS Power Ctrl Loop is used + * power_control.c: Log maximum allowed MS Power Level + * power_control.c: Clarify loop algo vars and use correct ones during log + * l1sap: is_fille_frame(): verify len of data compared + + [ Martin Hauke ] + * Fix common misspellings and typos + * Rename variable: CALIB_SUCESS -> CALIB_SUCCESS + + [ Philipp Maier ] + * scheduler_trx: use gsm0502_fn_remap() to calculate frame number + * scheduler_trx: initalize n_errors, n_bursts_bits, n_bits_total + * scheduler_trx.c: avoid division by zero when calculating BER + * rsl: ensure measurement reports are sent + * l1sap.c: ensure ms power control loop is running + + -- Pau Espin Pedrol Fri, 03 Jan 2020 17:18:44 +0100 + osmo-bts (1.1.0) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id132c615f7398402ac20d179e5917bea58ef3334 Gerrit-Change-Number: 16718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:40:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:40:49 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E62-fbfa-dirty_=E2=86=92_0=2E8=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16725 ) Change subject: Bump version: 0.7.0.62-fbfa-dirty ? 0.8.0 ...................................................................... Bump version: 0.7.0.62-fbfa-dirty ? 0.8.0 Change-Id: Ic5e69a396df659933fd4d50298b9925e837a6861 --- M configure.ac M debian/changelog M debian/control 3 files changed, 81 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/25/16725/1 diff --git a/configure.ac b/configure.ac index 2f29047..48de07a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,10 +77,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.3.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/changelog b/debian/changelog index 13e88c3..ae85b61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,79 @@ +osmo-pcu (0.8.0) unstable; urgency=medium + + [ Alexander Couzens ] + * tests: test encoding of egprs ul ack/nacks + * tbf_dl: add comments to the scheduler + * encoding: fix space, tabs + + [ Vadim Yanitskiy ] + * osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API + * osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap + * osmobts_sock.cpp: pcu_sock_read(): further simplify the code + * osmobts_sock.cpp: do not print the same debug message twice + * VTY: refactor pcu_vty_show_ms_all(): use show_ms() + * VTY: fix command 'show tbf all': properly filter TBFs + * BSSGP: do not reject SUSPEND ACK / NACK messages + * BSSGP: properly print BVCI for signalling messages (BVCI=0) + * tests/tbf: suspend warnings about the link quality measurements + * GprsMs::update_cs_ul(): clarify the meaning of old_link_qual + * gprs_bssgp_destroy(): fix memleak and NULL-pointer dereference + * PTCCH: implement basic message codec and API + * PTCCH: properly handle RTS.req for PCU_IF_SAPI_PTCCH + * pcuif_proto.h: extend RACH.ind with TRX / TS numbers + * PTCCH: properly handle RACH.ind for PCU_IF_SAPI_PTCCH + * VTY: add warning about changing PCU socket path at run-time + * VTY: cosmetic: use osmo_talloc_replace_string() + + [ Pau Espin Pedrol ] + * cosmetic: tbf: Rename T and N arrays + * Use proper API osmo_timer_setup() to set up timer struct + * Introduce osmo_tdef infra and timer VTY commands + * bts.cpp: Fix osmo_tdef initialization on older g++ compilers + * Use osmo_tdef for BSSGP T1 and T2 + * Use osmo_tdef to implement T3190 + * tests: TbfTest: Unify stderr and stdout to ease debugging + * Use osmo_tdef to implement ms-idle-time + * Use osmo_tdef to implement dl-tbf-idle-time + * pdch.cpp: Refactor bitvec param passing in rcv_control_block + * pdch.cpp: Use pcu_l1_meas previously filled by lower layers + * cosmetic: fix whitespace + * Move out tbf subclasses from tbf.h to their own headers + * Move tbf_{dl,ul} child constructors to respective .cpp files + * tbf_dl: Setup m_llc_timer in constructor using osmocom API + * tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state GPRS_RLCMAC_WAIT_RELEASE + * vty: Fix osmo_tdef timers not listed in write config + * Log RACH Requests using GSMTAP + * Log AGCH and PCH blocks using GSMTAP + * pcu_l1_if.cpp: Fix GSMTAP Imm Assign PCH wrong encoding + * pcu_l1_if.cpp: Drop unneeded byte in Imm Ass PCH buffer + * pcu_l1_if.cpp: Imm Assign PCH: clarify size of different items + * pcu_l1_if.cpp: Replace value 23 with libosmocore's GSM_MACBLOCK_LEN + * Fix assertion hit upon CCCH Paging Request + * doc: vty: Update osmo-pcu_vty_reference.xml + * Clarify (M)CS related VTY attributes + * Remove dash from name used in VTY cmd prompt + * tbf_dl.cpp: Fix typo in log line + * pcu_l1_if: Check pag_req id_lv len fits buffer + * prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace + * Fix trailing whitespace + * fix typo in log message + * Log BVCI PTP value upon msg recv + * Split identity_lv param into mi+mi_len + + [ Oliver Smith ] + * doc: update generated VTY reference + * tbf_dl: make preemptive retransmission optional + * Forward ETWS Primary Notification to MS + * tests/app_info: fix compiling with older g++ + * configure.ac: set C and C++ dialects + + [ Harald Welte ] + * manual: Fix copy+paste error + * manual: Fix documentation missing "-D" command line option + * manual: Add missing documentation for '-i' command line option + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:40:02 +0100 + osmo-pcu (0.7.0) unstable; urgency=medium [ Rafael Diniz ] diff --git a/debian/control b/debian/control index 497788c..87ad7e7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.1.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Homepage: http://osmocom.org/projects/osmopcu -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic5e69a396df659933fd4d50298b9925e837a6861 Gerrit-Change-Number: 16725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 18:54:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 18:54:32 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E1=2E38-9f2b-dirty_=E2=86=92_1=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16726 ) Change subject: Bump version: 1.1.1.38-9f2b-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.1.38-9f2b-dirty ? 1.2.0 Change-Id: I9009eb44e7d8100294da139300480fc3a2f6b616 --- M configure.ac M debian/changelog M debian/control M debian/patches/build-for-debian8.patch 4 files changed, 57 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/26/16726/1 diff --git a/configure.ac b/configure.ac index d5463e9..b0be728 100644 --- a/configure.ac +++ b/configure.ac @@ -75,9 +75,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index 96cd208..0ec7b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,55 @@ +osmo-trx (1.2.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-trx: log to stderr on signal received + * Drop old setPriority related code + * Transceiver: fix segfault during init if IP addr binding fails + * Transceiver: Check return value when binding IP addr for clock socket + * Transceiver: Clean up receival of downlink bursts + * Transceiver: Fix idle ul burst indications being dropped + * Transceiver: exit process when BTS drops connection + * Transceiver: Enable EDGE detection only on PDCH timeslots + * lms: Log available antennas if requested antenna fails + * device: Use LOGCHAN in set_antennas() + * Transceiver: Fix logging TN and version + * Transceiver: Use LOGCHAN in logRxBurst to unify log format + * Transceiver: Log error condition no burst in pullRadioVector() + * Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn + * Transceiver: Don't stop TRX if pulling from OFF timeslot + * radioInterface: Rename mRadio to mDevice + * radioInterfaceMulti: Check equals zero explicitly + * USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 + * USRPDevice: Return previous txGain if setting value failed + * LMSDevice: Return previous txGain/rxGain if setting value failed + * radioInterface: Remove unusued getRxGain() + * radioDevice: Introduce getTxGain() API + * radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls + * UHDDevice: Drop unneeded MULTI_ARFCN checks + * radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples() + * radioInterface: Mark setRxGain as virtual + * Move multi-ARFCN chan amount modification from UHDDevice to parent class + * radioInterface: Atomically fetch and change underrun variable + * radioInterfaceMulti: write frequency offset direction (rx/tx) in log line + * Use new libosmocore logging lock API + * Transceiver: Fix wrong response upon CMD HANDOVER failure + * uhd: use value already cached in tmp variable + * Transceiver.cpp: Introduce and use new logging categories + + [ Timo Jacobus ] + * Transceiver: Fixed copying of history into and from channelizer buffer. + + [ Alexander Chemeris ] + * vty: Don't enable random filler bursts automatically with EDGE. + * vty: Simplify filler burst settings and improve help and readability. + + [ Martin Hauke ] + * Fix common misspellings and typos + + [ Harald Welte ] + * trx: exit() on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:54:00 +0100 + osmo-trx (1.1.1) unstable; urgency=medium * UNRELEASED diff --git a/debian/control b/debian/control index 750f7b9..de4be16 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libtalloc-dev, libusrp-dev, liblimesuite-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-trx diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index cce063c..4bf0207 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9009eb44e7d8100294da139300480fc3a2f6b616 Gerrit-Change-Number: 16726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:02:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:02:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Drop unneeded mp_enable_conn_timeout_test References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 ) Change subject: mgw: Drop unneeded mp_enable_conn_timeout_test ...................................................................... mgw: Drop unneeded mp_enable_conn_timeout_test Latest osmo-mgw release is 1.7.0, so this param is not needed at all. Furthermore, the config can be moved to .cfg. Change-Id: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 --- M mgw/MGCP_Test.ttcn M mgw/osmo-mgw.cfg 2 files changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/16727/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index b46b178..77eed4b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -69,10 +69,6 @@ charstring mp_remote_ip := "127.0.0.1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; - - /* Whether to enable conn-timeout tests. Can be dropped completely and enabled unconditionally once new - * version of osmo-mgw is released (current version: 1.5.0) */ - boolean mp_enable_conn_timeout_test := true; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -95,9 +91,6 @@ f_vty_transceive(MGWVTY, "enable"); f_vty_enable_osmux(osmux_on); - if (mp_enable_conn_timeout_test) { - f_vty_config(MGWVTY, "mgcp", "conn-timeout 0"); - } } private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i) @@ -2199,8 +2192,6 @@ execute(TC_amr_oa_oa_rtp_conversion()); execute(TC_amr_bwe_bwe_rtp_conversion()); - if (mp_enable_conn_timeout_test) { - execute(TC_conn_timeout()); - } + execute(TC_conn_timeout()); } } diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index b27a50c..edc8190 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -31,6 +31,7 @@ sdp audio-payload name GSM sdp audio-payload send-ptime sdp audio-payload send-name + conn-timeout 0 loop 0 number endpoints 31 allow-transcoding -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 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: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 Gerrit-Change-Number: 16727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:04:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:04:36 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16728 ) Change subject: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test ...................................................................... ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test It was removed since latest osmo-mgw release is nowadays 1.7.0. Depends: osmo-ttcn3-hacks.git I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 Change-Id: Ia457546431e0c3bb3148f4886644ed3fa2513835 --- M ttcn3-mgw-test/MGCP_Test.cfg M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 3 files changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/28/16728/1 diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index d7cdcaf..0c6a550 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -10,7 +10,6 @@ [MODULE_PARAMETERS] mp_local_ip:= "172.18.4.181"; mp_remote_ip:= "172.18.4.180"; -mp_enable_conn_timeout_test := true; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 6973377..473782f 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -10,10 +10,6 @@ mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ -# conn-timeout must be disabled until release AFTER osmo-mgw 1.5.0 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/mp_enable_conn_timeout_test := true;/mp_enable_conn_timeout_test := false;/g" -i $VOL_BASE_DIR/mgw-tester/MGCP_Test.cfg -fi mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index b410dca..c97f08a 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -37,6 +37,7 @@ sdp audio-payload name GSM sdp audio-payload send-ptime sdp audio-payload send-name + conn-timeout 0 loop 0 number endpoints 31 allow-transcoding -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia457546431e0c3bb3148f4886644ed3fa2513835 Gerrit-Change-Number: 16728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:05:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:05:39 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E91-5997-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 ) Change subject: Bump version: 1.5.0.91-5997-dirty ? 1.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I99e6950db3f54c6291dd259bed9b5c46cc26c465 Gerrit-Change-Number: 16724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 19:05:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:05:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:05:41 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E91-5997-dirty_=E2=86=92_1=2E6=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 ) Change subject: Bump version: 1.5.0.91-5997-dirty ? 1.6.0 ...................................................................... Bump version: 1.5.0.91-5997-dirty ? 1.6.0 Change-Id: I99e6950db3f54c6291dd259bed9b5c46cc26c465 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control 4 files changed, 111 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index ac6dcb2..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -osmo-sgsn libgtp We dropped libgtp gtp_retranstimeout timer code which became a - no-op in osmo-ggsn.git c94837c6a401bf0f80791b619a9b4cfbe9160afd, - which means next osmo-sgsn release will require libgtp > 1.4.0. diff --git a/configure.ac b/configure.ac index ec7af6e..644a0bd 100644 --- a/configure.ac +++ b/configure.ac @@ -54,14 +54,14 @@ if test "x$osmo_ac_iu" = "xyes" ; then PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.4.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.6.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.5.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index 02ec236..2827f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-sgsn (1.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gprs_gmm: Introduce macros to access msgb's associated IU UE ctx + * gprs_llc.h: Improve documentation of some structs + * gprs_gmm.c: Improve doc on nullable parameters + * gprs_gmm.c: Drop unneeded brackets + * Introduce define TLLI_UNASSIGNED + * gprs_sgsn.c: Warn upon llme free unexpected scenarios + * gprs_gmm: Clarify comment during TLLI assignment + * gprs_sgsn.c: Remove recently introduced assert + * gprs_gmm: Introduce assert to guard against unexpected condition + * gprs_gmm.c: Use correct function to set MM_IDLE state during cleanup + * gprs_sgsn.h: Flag MM_CTX_T_GERAN_Iu as not supported + * gprs_gmm.c: Flag mmctx_set_(p)mm_state() functions static + * sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 + * gprs_gmm.c: Fix typo in log message + * gprs_gmm.c: Call mmctx_set_(p)mm_state only on related ran_type + * Introduce and use log macros when no mm ctx available + * gprs_gmm: Avoid spaces in fsm events and enum strings + * tests: Verify that timers can be set over VTY + * Replace own timer infra with libosmocore osmo_tdef + * tests: Introduce vty-transcript-test tests + * gprs_gmm.c: Use osmo_rai_name() in log line + * examples: Add osmo-sgsn_custom-sccp.cfg + * vty: Introduce cs7-instance-iu + * gprs_gmm.c: Print value_string of reject cause + * gprs_gmm.c: Add spec document to function documentation + * gtp: make echo_interval unsigned + * gtp: cb_delete_context(): Clarify why pdp->lib is set to NULL + * Introduce log helper LOGGGSN and log category DGTP + * sgsn: gtp: Drop related pdp contexts on echo timeout against GGSN + * Move lots of Iu/ranap specific code into its own file + * Move llc->MM/SM Gb specific glue code to its own file + * Split enum gprs_pmm_state into Iu and Gb counterparts + * Merge common allocation steps for Gb and Iu ctx + * gprs_gmm.c: Replace inet_ntoa with inet_ntop + * sgsn_cdr.c: Fix ip addr string buffer size + * sgsn_vty: Fix mmctx rate_ctr output indentation + * sgsn_vty: Print correct Iu mmctx id in 'show mm-context' + * Introduce FSM mm_state_gb_fsm + * Introduce FSM mm_state_iu_fsm + * vty: Print MM state and RAN type in show mm-context + * src/gprs/Makefile.am: Move build of shared .c files to an internal lib + * Move out gbproxy to its own subdir + * Move out gtphub to its own subdir + * Move out sgsn to its own subdir + * gmm: Move code handling GMM Attach Complete to its own function + * gmm: Move code handling GMM Routing Area Update Complete to its own function + * gmm: Move code handling GMM PTMSI Realloc Complete to its own function + * enum gprs_gmm_state: Fix spec reference + * Implement GMM State using osmocom FSM + * Split out GPRS SM layer into its own file + * sgsn: Reject PdpActReq if no GTP pdp ctx exists + * Introduce TODO-RELEASE file + * sgsn_libgtp.c: Drop use of deprecated libgtp APIs gtp_retrans*() + * gmm: Fix assertion hit during RA UPD REQ before completting gmm attach + * Improve logging in gprs_llc.c code + * gprs_llc.c: Use enum instead of hardcoded value + * gprs_gmm.c: Send XID reset with received TLLI + + [ Alexander Couzens ] + * gprs/gprs_gmm: implement T3314. Timeout to reset MM state READY->STANDBY + * gprs_gmm: only update gb/iu cell information when Iu/Gb present + * gprs_gmm: clarify comment of Iu follow-on request + * gprs_gmm: gsm48_rx_gmm_att_req(): refactor duplicated code + * sgsn_pdp_ctx_terminate: check llme before accessing + * gprs_ranap: send CommonId after receiving Security Mode Complete + * mm_gb_fsm: unassign the llme when entering MM_IDLE + * gprs_ranap: refactor REQUIRE_MM define + * sgsn: when receiving data PDU notify the Gb GMM fsm + * Avoid compiling unneeded files when building without Iu + * gprs_ranap: release Iu UE Context when exiting PMM Connected + * Iu: implement a user inactivity timer + * gprs_ranap: on Iu release, stop the attach fsm if running + * gprs_mm_state_gb_fsm: ensure T3350 is not running when entering IDLE + * gprs_ranap: add missing rc = 0 + * gprs_sgsn: always allocate Gb/Iu mm fsm + * sgsn: MM Gb Fsm: fix event handling for implicit detach + * ranap: add non-spec X1001 + * gprs_gmm: release Iu connection on RAU failures + * sgsn_mm_ctx_alloc(): check for unallocated fsms + * sgsn_libgtp: refactor ps paging into gprs_gb + * sgsn: Gb: implementing PS Paging when MS is MM_STANDBY + + [ Vadim Yanitskiy ] + * gprs_mm_state_iu_fsm.c: fix: assign timer_cb to mm_state_iu_fsm + + [ Max ] + * Use libosmocore constant for IMSI length in ACL entry + + [ Harald Welte ] + * LLC: Don't use hard-coded N201-U / N201-I values in XID + * Initial OsmoGbPROXY user manual + * check for osmo_fsm_register() error return values + * check for osmo_ss7_init() error return value + * manual: Fix copy+paste error + * exit(2) on unsupported positional arguments on command line + + [ Oliver Smith ] + * gitignore: fix paths to binaries + * doc: add OsmoGbProxy VTY reference + * regen_doc.sh: support gbproxy, run without docker + * osmoappdesc.py, tests: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:17:56 +0100 + osmo-sgsn (1.5.0) unstable; urgency=medium [ Max ] diff --git a/debian/control b/debian/control index df1f070..a37ff65 100644 --- a/debian/control +++ b/debian/control @@ -12,13 +12,13 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.4.0), + libgtp-dev (>= 1.5.0), libosmocore-dev (>= 1.2.0), libosmo-abis-dev (>= 0.6.0), libosmo-netif-dev (>= 0.4.0), libosmo-gsup-client-dev (>= 1.0.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 0.4.0), + libosmo-ranap-dev (>= 0.6.0), libosmo-sigtran-dev (>= 1.0.0), libosmo-sccp-dev (>= 1.0.0), osmo-gsm-manuals-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I99e6950db3f54c6291dd259bed9b5c46cc26c465 Gerrit-Change-Number: 16724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:06:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:06:38 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E3=2E2?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/16723 ) Change subject: Bump version: 1.3.1 ? 1.3.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I4f7b6c0f18fd1f11e04ae34275645b439d3613fb Gerrit-Change-Number: 16723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 19:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:06:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:06:42 +0000 Subject: =?UTF-8?Q?Change_in_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E1_=E2=86=92_1=2E3=2E2?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/16723 ) Change subject: Bump version: 1.3.1 ? 1.3.2 ...................................................................... Bump version: 1.3.1 ? 1.3.2 Change-Id: I4f7b6c0f18fd1f11e04ae34275645b439d3613fb --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index ec4e072..e670c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +openbsc (1.3.2) unstable; urgency=medium + + [ Harald Welte ] + * manual: Fix copy+paste error + + [ Oliver Smith ] + * osmoappdesc.py, tests, ipa.py: switch to python 3 + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:12:23 +0100 + openbsc (1.3.1) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I4f7b6c0f18fd1f11e04ae34275645b439d3613fb Gerrit-Change-Number: 16723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:07:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:07:55 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E62-fbfa-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16725 ) Change subject: Bump version: 0.7.0.62-fbfa-dirty ? 0.8.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic5e69a396df659933fd4d50298b9925e837a6861 Gerrit-Change-Number: 16725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 19:07:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:07:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:07:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E62-fbfa-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16725 ) Change subject: Bump version: 0.7.0.62-fbfa-dirty ? 0.8.0 ...................................................................... Bump version: 0.7.0.62-fbfa-dirty ? 0.8.0 Change-Id: Ic5e69a396df659933fd4d50298b9925e837a6861 --- M configure.ac M debian/changelog M debian/control 3 files changed, 81 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 2f29047..48de07a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,10 +77,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.3.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/changelog b/debian/changelog index 13e88c3..ae85b61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,79 @@ +osmo-pcu (0.8.0) unstable; urgency=medium + + [ Alexander Couzens ] + * tests: test encoding of egprs ul ack/nacks + * tbf_dl: add comments to the scheduler + * encoding: fix space, tabs + + [ Vadim Yanitskiy ] + * osmobts_sock.cpp: pcu_sock_cb(): use libosmocore's socket API + * osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap + * osmobts_sock.cpp: pcu_sock_read(): further simplify the code + * osmobts_sock.cpp: do not print the same debug message twice + * VTY: refactor pcu_vty_show_ms_all(): use show_ms() + * VTY: fix command 'show tbf all': properly filter TBFs + * BSSGP: do not reject SUSPEND ACK / NACK messages + * BSSGP: properly print BVCI for signalling messages (BVCI=0) + * tests/tbf: suspend warnings about the link quality measurements + * GprsMs::update_cs_ul(): clarify the meaning of old_link_qual + * gprs_bssgp_destroy(): fix memleak and NULL-pointer dereference + * PTCCH: implement basic message codec and API + * PTCCH: properly handle RTS.req for PCU_IF_SAPI_PTCCH + * pcuif_proto.h: extend RACH.ind with TRX / TS numbers + * PTCCH: properly handle RACH.ind for PCU_IF_SAPI_PTCCH + * VTY: add warning about changing PCU socket path at run-time + * VTY: cosmetic: use osmo_talloc_replace_string() + + [ Pau Espin Pedrol ] + * cosmetic: tbf: Rename T and N arrays + * Use proper API osmo_timer_setup() to set up timer struct + * Introduce osmo_tdef infra and timer VTY commands + * bts.cpp: Fix osmo_tdef initialization on older g++ compilers + * Use osmo_tdef for BSSGP T1 and T2 + * Use osmo_tdef to implement T3190 + * tests: TbfTest: Unify stderr and stdout to ease debugging + * Use osmo_tdef to implement ms-idle-time + * Use osmo_tdef to implement dl-tbf-idle-time + * pdch.cpp: Refactor bitvec param passing in rcv_control_block + * pdch.cpp: Use pcu_l1_meas previously filled by lower layers + * cosmetic: fix whitespace + * Move out tbf subclasses from tbf.h to their own headers + * Move tbf_{dl,ul} child constructors to respective .cpp files + * tbf_dl: Setup m_llc_timer in constructor using osmocom API + * tbf_dl.cpp: Remove dup call to tbf_update_ms_class() in state GPRS_RLCMAC_WAIT_RELEASE + * vty: Fix osmo_tdef timers not listed in write config + * Log RACH Requests using GSMTAP + * Log AGCH and PCH blocks using GSMTAP + * pcu_l1_if.cpp: Fix GSMTAP Imm Assign PCH wrong encoding + * pcu_l1_if.cpp: Drop unneeded byte in Imm Ass PCH buffer + * pcu_l1_if.cpp: Imm Assign PCH: clarify size of different items + * pcu_l1_if.cpp: Replace value 23 with libosmocore's GSM_MACBLOCK_LEN + * Fix assertion hit upon CCCH Paging Request + * doc: vty: Update osmo-pcu_vty_reference.xml + * Clarify (M)CS related VTY attributes + * Remove dash from name used in VTY cmd prompt + * tbf_dl.cpp: Fix typo in log line + * pcu_l1_if: Check pag_req id_lv len fits buffer + * prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace + * Fix trailing whitespace + * fix typo in log message + * Log BVCI PTP value upon msg recv + * Split identity_lv param into mi+mi_len + + [ Oliver Smith ] + * doc: update generated VTY reference + * tbf_dl: make preemptive retransmission optional + * Forward ETWS Primary Notification to MS + * tests/app_info: fix compiling with older g++ + * configure.ac: set C and C++ dialects + + [ Harald Welte ] + * manual: Fix copy+paste error + * manual: Fix documentation missing "-D" command line option + * manual: Add missing documentation for '-i' command line option + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:40:02 +0100 + osmo-pcu (0.7.0) unstable; urgency=medium [ Rafael Diniz ] diff --git a/debian/control b/debian/control index 497788c..87ad7e7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.1.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 Homepage: http://osmocom.org/projects/osmopcu -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic5e69a396df659933fd4d50298b9925e837a6861 Gerrit-Change-Number: 16725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:08:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:08:45 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E1=2E38-9f2b-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16726 ) Change subject: Bump version: 1.1.1.38-9f2b-dirty ? 1.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9009eb44e7d8100294da139300480fc3a2f6b616 Gerrit-Change-Number: 16726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 19:08:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:09:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:09:05 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E1=2E38-9f2b-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16726 ) Change subject: Bump version: 1.1.1.38-9f2b-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.1.38-9f2b-dirty ? 1.2.0 Change-Id: I9009eb44e7d8100294da139300480fc3a2f6b616 --- M configure.ac M debian/changelog M debian/control M debian/patches/build-for-debian8.patch 4 files changed, 57 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index d5463e9..b0be728 100644 --- a/configure.ac +++ b/configure.ac @@ -75,9 +75,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index 96cd208..0ec7b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,55 @@ +osmo-trx (1.2.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-trx: log to stderr on signal received + * Drop old setPriority related code + * Transceiver: fix segfault during init if IP addr binding fails + * Transceiver: Check return value when binding IP addr for clock socket + * Transceiver: Clean up receival of downlink bursts + * Transceiver: Fix idle ul burst indications being dropped + * Transceiver: exit process when BTS drops connection + * Transceiver: Enable EDGE detection only on PDCH timeslots + * lms: Log available antennas if requested antenna fails + * device: Use LOGCHAN in set_antennas() + * Transceiver: Fix logging TN and version + * Transceiver: Use LOGCHAN in logRxBurst to unify log format + * Transceiver: Log error condition no burst in pullRadioVector() + * Transceiver: pullRadioVector(): Fix use of uninitialized value bi->tn + * Transceiver: Don't stop TRX if pulling from OFF timeslot + * radioInterface: Rename mRadio to mDevice + * radioInterfaceMulti: Check equals zero explicitly + * USRPDevice: Fix setRxGain return on error and getRxGain() returning always 0 + * USRPDevice: Return previous txGain if setting value failed + * LMSDevice: Return previous txGain/rxGain if setting value failed + * radioInterface: Remove unusued getRxGain() + * radioDevice: Introduce getTxGain() API + * radioInterfaceMulti: Override setTxGain() to avoid chan!=0 calls + * UHDDevice: Drop unneeded MULTI_ARFCN checks + * radioInterface{Multi,Resamp}: Fix successful writeSamples() masking underrun from readSamples() + * radioInterface: Mark setRxGain as virtual + * Move multi-ARFCN chan amount modification from UHDDevice to parent class + * radioInterface: Atomically fetch and change underrun variable + * radioInterfaceMulti: write frequency offset direction (rx/tx) in log line + * Use new libosmocore logging lock API + * Transceiver: Fix wrong response upon CMD HANDOVER failure + * uhd: use value already cached in tmp variable + * Transceiver.cpp: Introduce and use new logging categories + + [ Timo Jacobus ] + * Transceiver: Fixed copying of history into and from channelizer buffer. + + [ Alexander Chemeris ] + * vty: Don't enable random filler bursts automatically with EDGE. + * vty: Simplify filler burst settings and improve help and readability. + + [ Martin Hauke ] + * Fix common misspellings and typos + + [ Harald Welte ] + * trx: exit() on unsupported positional arguments on command line + + -- Pau Espin Pedrol Fri, 03 Jan 2020 19:54:00 +0100 + osmo-trx (1.1.1) unstable; urgency=medium * UNRELEASED diff --git a/debian/control b/debian/control index 750f7b9..de4be16 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libtalloc-dev, libusrp-dev, liblimesuite-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-trx diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index cce063c..4bf0207 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 0.12.0), + libosmocore-dev (>= 1.3.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9009eb44e7d8100294da139300480fc3a2f6b616 Gerrit-Change-Number: 16726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:19:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:19:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ggsn: Drop unneeded mp_enable_conn_timeout_test References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 ) Change subject: ggsn: Drop unneeded mp_enable_conn_timeout_test ...................................................................... ggsn: Drop unneeded mp_enable_conn_timeout_test Latest osmo-ggsn release is 1.75.0, so this param is not needed at all. Change-Id: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/16729/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 44dba4a..40506df 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -64,13 +64,6 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ - - /* - * Whether ggsn supports "(no) echo-interval" VTY command - * (osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f). - * This option can be dropped after osmo-ggsn release > 1.4.0 exists. - */ - boolean m_ggsn_supports_echo_interval := true; } type set PdpContext { @@ -203,9 +196,7 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); - if (m_ggsn_supports_echo_interval) { - f_vty_enable_echo_interval(g_use_echo); - } + f_vty_enable_echo_interval(g_use_echo); } /* Altstep implementing responses to any incoming echo requests */ @@ -1506,8 +1497,6 @@ execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); - if (m_ggsn_supports_echo_interval) { - execute(TC_pdp_act_restart_ctr_echo()); - } + execute(TC_pdp_act_restart_ctr_echo()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 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: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Gerrit-Change-Number: 16729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:23:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:23:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ggsn: Drop unneeded mp_enable_conn_timeout_test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 to look at the new patch set (#2). Change subject: ggsn: Drop unneeded mp_enable_conn_timeout_test ...................................................................... ggsn: Drop unneeded mp_enable_conn_timeout_test Latest osmo-ggsn release is 1.5.0, so this param is not needed at all. Change-Id: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/16729/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 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: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Gerrit-Change-Number: 16729 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:25:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:25:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ggsn: Drop unneeded m_ggsn_supports_echo_interval In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 to look at the new patch set (#3). Change subject: ggsn: Drop unneeded m_ggsn_supports_echo_interval ...................................................................... ggsn: Drop unneeded m_ggsn_supports_echo_interval Latest osmo-ggsn release is 1.5.0, so this param is not needed at all. Change-Id: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/16729/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 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: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Gerrit-Change-Number: 16729 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:25:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:25:31 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16730 ) Change subject: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest ...................................................................... ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest Latest tagged release of libosmo-sccp, version 1.2.0, already supports the regular osmo-stp.cfg file. Change-Id: Ifb3eb642fa5547d1ce2de81f51f181e226dceed7 --- M ttcn3-stp-test/jenkins.sh D ttcn3-stp-test/latest/osmo-stp.cfg 2 files changed, 0 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/16730/1 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 6195e3c..939dc36 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,11 +12,6 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp -if [ "$IMAGE_SUFFIX" = "latest" ]; then - cp latest/osmo-stp.cfg $VOL_BASE_DIR/stp/ -else - cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -fi network_create 172.18.19.0/24 diff --git a/ttcn3-stp-test/latest/osmo-stp.cfg b/ttcn3-stp-test/latest/osmo-stp.cfg deleted file mode 100644 index 37c453d..0000000 --- a/ttcn3-stp-test/latest/osmo-stp.cfg +++ /dev/null @@ -1,112 +0,0 @@ -! -! OsmoSTP (1.1.0.2-3884) configuration saved from vty -!! -! -log gsmtap 172.18.19.203 - logging level set-all debug - logging filter all 1 -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all debug -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -cs7 instance 0 - point-code format 24 -! -!M3UA AS/ASP: -! - asp asp-sender 9999 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-receiver0 10000 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-receiver1 10001 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-client0 10002 2906 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as as-sender m3ua - asp asp-sender - routing-key 1023 23 - as as-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 -! -! IPA AS/ASP: -! - asp ipa-asp-loadshare-sender 20000 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 -! LOADSHARE: - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender - asp ipa-asp-loadshare-receiver0 20001 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp ipa-asp-loadshare-receiver1 20002 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 -! OVERRIDE: - asp ipa-asp-override-sender 20004 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-override-sender ipa - routing-key 0 6 - point-code override dpc 33 - asp ipa-asp-override-sender - asp ipa-asp-override-receiver0 20005 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp ipa-asp-override-receiver1 20006 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-override-receiver ipa - traffic-mode override - routing-key 0 8 - point-code override dpc 34 - asp ipa-asp-override-receiver0 - asp ipa-asp-override-receiver1 -! DYNAMIC AS: - as ipa-as-dynamic-asp ipa - routing-key 0 5 - point-code override dpc 23 -! -! ROUTING TABLE: -! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp -! -!SERVERS: -! - listen m3ua 2905 - accept-asp-connections dynamic-permitted - listen ipa 5000 - accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifb3eb642fa5547d1ce2de81f51f181e226dceed7 Gerrit-Change-Number: 16730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:25:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:25:31 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16731 ) Change subject: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval ...................................................................... ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval It was removed since latest osmo-ggsn release is nowadays 1.5.0. Depends: osmo-ttcn3-hacks.git Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Change-Id: I9ffd7549172055e6180a5c3f167dcc1133648243 --- M ttcn3-ggsn-test/GGSN_Tests.cfg M ttcn3-ggsn-test/jenkins.sh 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/16731/1 diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg index 11c22cb..064bf37 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/GGSN_Tests.cfg @@ -18,7 +18,5 @@ # GGSN announced DNS address GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" -GGSN_Tests.m_ggsn_supports_echo_interval := true; - [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 66239f8..ac26c0f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -10,10 +10,6 @@ mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ -# VTY command "(no) echo-interval" must be disabled until osmo-ggsn.git release > 1.4.0 is available. -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/GGSN_Tests.m_ggsn_supports_echo_interval := true;/GGSN_Tests.m_ggsn_supports_echo_interval := false;/g" -i $VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg -fi mkdir $VOL_BASE_DIR/ggsn cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ffd7549172055e6180a5c3f167dcc1133648243 Gerrit-Change-Number: 16731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:27:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:27:35 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn: Drop unneeded .cfg change for latest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16732 ) Change subject: ttcn3-sgsn: Drop unneeded .cfg change for latest ...................................................................... ttcn3-sgsn: Drop unneeded .cfg change for latest Latest libosmo-sccp release 1.2.0 already uses same id as master. Change-Id: Ib7473de84521c37d6408ac1235244250284bd59a --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/32/16732/1 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 7f322f4..5464ca6 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,12 +16,6 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ -# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from -# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines -# below can be dropped: -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7473de84521c37d6408ac1235244250284bd59a Gerrit-Change-Number: 16732 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:29:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:29:11 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Drop unneeded modifications for latest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16733 ) Change subject: ttcn3-pcu: Drop unneeded modifications for latest ...................................................................... ttcn3-pcu: Drop unneeded modifications for latest Latest osmo-pcu release 0.8.0 already behaves same as master. Change-Id: I774af9eb7625891d906d33a0ea0ab3ffc5973a32 --- M ttcn3-pcu-test/jenkins.sh 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/16733/1 diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 4305a8d..e0f1212 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -13,22 +13,10 @@ mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ -# Latest release of osmo-pcu (0.7.0) has prompt "Osmo-PCU", while master uses more -# usual osmocom form "OsmoPCU". This can be removed once a new osmo-pcu version is released -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/OsmoPCU/Osmo-PCU/g" -i $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg -fi mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix cp osmo-pcu.cfg $VOL_BASE_DIR/pcu/ -# Latest release of osmo-pcu (0.7.0) doesn't know some gsmtap categories -# This can be removed once a new osmo-pcu version is released -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/gsmtap-category dl-agch//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed "s/gsmtap-category dl-pch//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed "s/gsmtap-category ul-rach//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi mkdir $VOL_BASE_DIR/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I774af9eb7625891d906d33a0ea0ab3ffc5973a32 Gerrit-Change-Number: 16733 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 19:31:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jan 2020 19:31:31 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16734 ) Change subject: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest ...................................................................... ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest Latest osmo-sip-connector release 1.4.0 already behaves the same as master. Change-Id: I3c8ef08c7a60e0c83c43ea79e882dfb2d2328fa6 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/16734/1 diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 3d7d523..0bc0357 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -14,10 +14,6 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ -if [ "x${IMAGE_SUFFIX}" != "xmaster" ]; then - sed -i 's/mp_mncc_version := [0-9]*/mp_mncc_version:= 5/' "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c8ef08c7a60e0c83c43ea79e882dfb2d2328fa6 Gerrit-Change-Number: 16734 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:14:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:14:27 +0000 Subject: Change in libosmocore[master]: bitvec: Fix return value in doc for bitvec_write_field() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16719 ) Change subject: bitvec: Fix return value in doc for bitvec_write_field() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I629e71242cb6bafa3c1b1d65ae7ec6687ec203d1 Gerrit-Change-Number: 16719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 22:14:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:14:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:14:32 +0000 Subject: Change in libosmocore[master]: bitvec: Fix return value in doc for bitvec_write_field() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16719 ) Change subject: bitvec: Fix return value in doc for bitvec_write_field() ...................................................................... bitvec: Fix return value in doc for bitvec_write_field() Change-Id: I629e71242cb6bafa3c1b1d65ae7ec6687ec203d1 --- M src/bitvec.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bitvec.c b/src/bitvec.c index 0c263ad..ef8621c 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -497,7 +497,7 @@ * \param[in] bv The boolean vector to work on * \param[in,out] write_index Where writing supposed to start in the vector * \param[in] len How many bits to write - * \returns next write index or negative value on error + * \returns 0 on success, negative value on error */ int bitvec_write_field(struct bitvec *bv, unsigned int *write_index, uint64_t val, unsigned int len) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I629e71242cb6bafa3c1b1d65ae7ec6687ec203d1 Gerrit-Change-Number: 16719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:15:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:15:01 +0000 Subject: Change in libosmocore[master]: gb: Fix typo in bssgp_cause_strings description In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16720 ) Change subject: gb: Fix typo in bssgp_cause_strings description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2474bbe99bf0aa35aab046a1987047a8368beff6 Gerrit-Change-Number: 16720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 22:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:15:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:15:04 +0000 Subject: Change in libosmocore[master]: gb: Fix typo in bssgp_cause_strings description In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16720 ) Change subject: gb: Fix typo in bssgp_cause_strings description ...................................................................... gb: Fix typo in bssgp_cause_strings description Change-Id: I2474bbe99bf0aa35aab046a1987047a8368beff6 --- M src/gb/gprs_bssgp_util.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c index 669dfb8..7708949 100644 --- a/src/gb/gprs_bssgp_util.c +++ b/src/gb/gprs_bssgp_util.c @@ -43,7 +43,7 @@ static const struct value_string bssgp_cause_strings[] = { { BSSGP_CAUSE_PROC_OVERLOAD, "Processor overload" }, { BSSGP_CAUSE_EQUIP_FAIL, "Equipment Failure" }, - { BSSGP_CAUSE_TRASIT_NET_FAIL, "Transit netowkr service failure" }, + { BSSGP_CAUSE_TRASIT_NET_FAIL, "Transit network service failure" }, { BSSGP_CAUSE_CAPA_GREATER_0KPBS, "Transmission capacity modified" }, { BSSGP_CAUSE_UNKNOWN_MS, "Unknown MS" }, { BSSGP_CAUSE_UNKNOWN_BVCI, "Unknown BVCI" }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2474bbe99bf0aa35aab046a1987047a8368beff6 Gerrit-Change-Number: 16720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:16:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:16:03 +0000 Subject: Change in libosmocore[master]: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16697 ) Change subject: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc Gerrit-Change-Number: 16697 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 22:16:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:16:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:16:08 +0000 Subject: Change in libosmocore[master]: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16697 ) Change subject: logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed ...................................................................... logging_vty.c: Avoid acquiring log tgt lock in logging level cmd when not needed Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc --- M src/vty/logging_vty.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6d908d9..c51b437 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -351,18 +351,18 @@ int category = log_parse_category(argv[0]); int level = log_parse_level(argv[1]); - ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); - if (level < 0) { vty_out(vty, "Invalid level `%s'%s", argv[1], VTY_NEWLINE); - RET_WITH_UNLOCK(CMD_WARNING); + return CMD_WARNING; } if (category < 0) { vty_out(vty, "Invalid category `%s'%s", argv[0], VTY_NEWLINE); - RET_WITH_UNLOCK(CMD_WARNING); + return CMD_WARNING; } + ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); + tgt->categories[category].enabled = 1; tgt->categories[category].loglevel = level; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6780221174070cee408625e24513f2c11cc9dfc Gerrit-Change-Number: 16697 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:17:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:17:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 22:17:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:19:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:19:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity ...................................................................... Patch Set 2: There is a fuzzy qualifier that allows you to encode illegal values. I never used it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 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: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 03 Jan 2020 22:19:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:19:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:19:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 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: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 22:19:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:20:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:20:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 22:20:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:20:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:20:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 ) Change subject: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 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: I40c2a3c38799a625836e4c28f476524c92077b83 Gerrit-Change-Number: 16694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jan 2020 22:20:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:20:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:20:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 ) Change subject: library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union ...................................................................... library/RLCMAC_CSN1_Types.ttcn: fix ps / cs selection in PageInfo union Change-Id: I40c2a3c38799a625836e4c28f476524c92077b83 --- M library/RLCMAC_CSN1_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 6 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 11df29d..321049c 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -230,6 +230,8 @@ type union PageInfo { PageInfoPs ps, PageInfoCs cs + } with { + variant "TAG(ps, presence = '0'B; cs, presence = '1'B)" }; type record PacketPagingReq { PageMode page_mode, diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d19093c..cd13ff5 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1299,10 +1299,8 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) - because TTCN3 counts length up to octet boundary and thinks it's a - PageInfoPs: */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) { /* TODO: Verify MI contents encoded match */ setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")"); @@ -1351,10 +1349,8 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) - because TTCN3 counts length up to octet boundary and thinks it's a - PageInfoPs: */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + /* FIXME: actually match the identity */ + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16694 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: I40c2a3c38799a625836e4c28f476524c92077b83 Gerrit-Change-Number: 16694 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 3 22:20:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jan 2020 22:20:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: fix: actually match IMSI in Packet Paging Request In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 ) Change subject: PCU: fix: actually match IMSI in Packet Paging Request ...................................................................... PCU: fix: actually match IMSI in Packet Paging Request Change-Id: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc --- M library/L3_Templates.ttcn M library/RLCMAC_CSN1_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 35 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 0556c97..6b5f5c2 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2833,6 +2833,9 @@ external function enc_MobileIdentityLV(in MobileIdentityLV si) return octetstring with { extension "prototype(convert) encode(RAW)" }; +external function dec_MobileIdentityV(in octetstring mi) return MobileIdentityV + with { extension "prototype(convert) decode(RAW)" }; + /* SMS TPDU Layer */ diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 321049c..1bb6232 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -204,7 +204,10 @@ * uses a byte. */ uint4_t len, octetstring mobile_id - } with { variant (len) "LENGTHTO(mobile_id)" }; + } with { + variant (len) "LENGTHTO(mobile_id)" + variant (mobile_id) "BYTEORDER(first)" + }; type record PageInfoPs { BIT1 presence ('0'B), BIT1 ptmsi_or_mobile_id, diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index cd13ff5..d0181a9 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1247,6 +1247,28 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } +private function f_pkt_paging_match_imsi(in PacketPagingReq req, hexstring imsi) { + var MobileIdentityLV_Paging mi_lv := req.repeated_pageinfo.cs.mobile_identity; + var MobileIdentityV mi := dec_MobileIdentityV(mi_lv.mobile_id); + + if (mi_lv.len != 8) { /* 8 octets: type of ID (3 bits) + even/odd flag (1 bit) + 15 BCD-encoded digits (60 bits) */ + setverdict(fail, "Mobile Identity length mismatch: ", + "expected: 8, got: ", mi_lv.len); + mtc.stop; + } + + /* Make sure MI contains IMSI before referencing it */ + if (mi.typeOfIdentity != '001'B) { + setverdict(fail, "Mobile Identity must be of type IMSI ('001'B), ", + "got: ", mi.typeOfIdentity); + mtc.stop; + } else if (mi.oddEvenInd_identity.imsi.digits != imsi) { + setverdict(fail, "Mobile Identity contains unexpected IMSI, ", + "expected: ", imsi, " got: ", mi.oddEvenInd_identity.imsi.digits); + mtc.stop; + } +} + /* Test CS paging over the BTS<->PCU socket. * When a (class B or C, not A) MS has an active TBF (or is on the PDCH), the MS can not react on CS paging over CCCH. * Paging should be send on the PACCH. @@ -1263,7 +1285,6 @@ var OCT4 tlli := '00000001'O; var MobileL3_CommonIE_Types.MobileIdentityLV mi; var octetstring mi_enc_lv; - var MobileIdentityLV_Paging mi_res; var hexstring imsi := f_gen_imsi(42); /* Initialize NS/BSSGP side */ @@ -1300,12 +1321,9 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; - if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) { - /* TODO: Verify MI contents encoded match */ - setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")"); - mtc.stop; - } + /* Make sure that Packet Paging Request contains the same IMSI */ + f_pkt_paging_match_imsi(dl_block.ctrl.payload.u.paging, imsi); + setverdict(pass); } @@ -1317,7 +1335,6 @@ var RlcmacDlBlock dl_block; var boolean ok; var OCT4 tlli := '00000001'O; - var MobileIdentityLV_Paging mi_res; var hexstring imsi := f_gen_imsi(42); /* Initialize NS/BSSGP side */ @@ -1349,8 +1366,9 @@ /* Receive it on BTS side towards MS */ f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); - /* FIXME: actually match the identity */ - mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.cs.mobile_identity; + /* Make sure that Packet Paging Request contains the same IMSI */ + f_pkt_paging_match_imsi(dl_block.ctrl.payload.u.paging, imsi); + setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16695 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: I0afdd53fd5d2a89e139f65a7aec412a2e12511cc Gerrit-Change-Number: 16695 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 4 02:21:05 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:21:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5e0ff6ad6da95_2d9c2b276ec9e60c11703a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 319s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 319s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 319s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 319s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 319s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 319s] make[4]: Nothing to be done for 'install-exec-am'. [ 319s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 319s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 319s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 319s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 319s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 319s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 319s] dh_install -O--fail-missing [ 319s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 319s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 319s] dh_install: missing files, aborting [ 319s] debian/rules:12: recipe for target 'binary' failed [ 319s] make: *** [binary] Error 2 [ 319s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 319s] [ 319s] obs-arm-8 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:20:56 UTC 2020. [ 319s] [ 319s] ### VM INTERACTION START ### [ 322s] [ 308.602321] sysrq: Power Off [ 322s] [ 308.611313] reboot: Power down [ 322s] ### VM INTERACTION END ### [ 322s] [ 322s] obs-arm-8 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:20:59 UTC 2020. [ 322s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:22:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:22:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5e0ff6e8ccfd0_2d9c2b276ec9e60c117336@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/aarch64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 332s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 332s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 332s] dh_install -O--fail-missing [ 332s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 332s] dh_install: This feature will be removed in compat 12. [ 333s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 333s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 333s] dh_missing: missing files, aborting [ 333s] The following debhelper tools have reported what they installed (with files per package) [ 333s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 333s] If the missing files are installed by another tool, please file a bug against it. [ 333s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 333s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 333s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 333s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 333s] For a short-term work-around: Add the files to debian/not-installed [ 333s] dh_install: dh_missing --fail-missing returned exit code 2 [ 333s] make: *** [debian/rules:12: binary] Error 25 [ 333s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 333s] [ 333s] obs-arm-8 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:21:56 UTC 2020. [ 333s] [ 333s] ### VM INTERACTION START ### [ 336s] [ 319.377193] sysrq: Power Off [ 336s] [ 319.419380] reboot: Power down [ 336s] ### VM INTERACTION END ### [ 336s] [ 336s] obs-arm-8 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:22:00 UTC 2020. [ 336s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:23:05 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:23:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5e0ff723d1638_2d9c2b276ec9e60c117557@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 164s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 164s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 164s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 164s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 164s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 164s] make[4]: Nothing to be done for 'install-exec-am'. [ 164s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 164s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 164s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 164s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] dh_install -O--fail-missing [ 164s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 164s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 164s] dh_install: missing files, aborting [ 164s] debian/rules:12: recipe for target 'binary' failed [ 164s] make: *** [binary] Error 2 [ 164s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 164s] [ 164s] build74 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:22:54 UTC 2020. [ 164s] [ 164s] ### VM INTERACTION START ### [ 167s] [ 157.695018] sysrq: SysRq : Power Off [ 167s] [ 157.705246] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] build74 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:22:57 UTC 2020. [ 168s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:23:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:23:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5e0ff74448021_2d9c2b276ec9e60c1176bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 324s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 324s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 324s] dh_install -O--fail-missing [ 324s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 324s] dh_install: This feature will be removed in compat 12. [ 324s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 324s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 324s] dh_missing: missing files, aborting [ 324s] The following debhelper tools have reported what they installed (with files per package) [ 324s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 324s] If the missing files are installed by another tool, please file a bug against it. [ 324s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 324s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 324s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 324s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 324s] For a short-term work-around: Add the files to debian/not-installed [ 324s] dh_install: dh_missing --fail-missing returned exit code 2 [ 324s] make: *** [debian/rules:12: binary] Error 25 [ 324s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 324s] [ 324s] lamb58 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:23:41 UTC 2020. [ 324s] [ 324s] ### VM INTERACTION START ### [ 327s] [ 310.955793] sysrq: SysRq : Power Off [ 327s] [ 310.963988] reboot: Power down [ 327s] ### VM INTERACTION END ### [ 327s] [ 327s] lamb58 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:23:44 UTC 2020. [ 327s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:24:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:24:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5e0ff763883b1_2d9c2b276ec9e60c117794@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 332s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 332s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 332s] dh_install -O--fail-missing [ 332s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 332s] dh_install: This feature will be removed in compat 12. [ 332s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 332s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 332s] dh_missing: missing files, aborting [ 332s] The following debhelper tools have reported what they installed (with files per package) [ 332s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 332s] If the missing files are installed by another tool, please file a bug against it. [ 332s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 332s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 332s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 332s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 332s] For a short-term work-around: Add the files to debian/not-installed [ 332s] dh_install: dh_missing --fail-missing returned exit code 2 [ 332s] make: *** [debian/rules:12: binary] Error 25 [ 332s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 332s] [ 332s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:24:00 UTC 2020. [ 332s] [ 332s] ### VM INTERACTION START ### [ 335s] [ 319.968392] sysrq: SysRq : Power Off [ 335s] [ 319.975835] reboot: Power down [ 335s] ### VM INTERACTION END ### [ 335s] [ 335s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:24:03 UTC 2020. [ 335s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:25:05 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:25:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e0ff79ce39c9_2d9c2b276ec9e60c117859@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 286s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 286s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 286s] dh_install -O--fail-missing [ 286s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 286s] dh_install: This feature will be removed in compat 12. [ 286s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 286s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 286s] dh_missing: missing files, aborting [ 286s] The following debhelper tools have reported what they installed (with files per package) [ 286s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 286s] If the missing files are installed by another tool, please file a bug against it. [ 286s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 286s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 286s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 286s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 286s] For a short-term work-around: Add the files to debian/not-installed [ 286s] dh_install: dh_missing --fail-missing returned exit code 255 [ 286s] make: *** [debian/rules:12: binary] Error 255 [ 286s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 286s] [ 286s] build85 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:24:54 UTC 2020. [ 286s] [ 286s] ### VM INTERACTION START ### [ 289s] [ 278.115784] sysrq: SysRq : Power Off [ 289s] [ 278.117780] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] build85 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:24:58 UTC 2020. [ 290s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:25:22 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:25:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5e0ff79e31bc0_2d9c2b276ec9e60c11809c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 438s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 438s] dh_install -O--fail-missing [ 438s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 438s] dh_install: This feature will be removed in compat 12. [ 438s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 438s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 438s] dh_missing: missing files, aborting [ 438s] The following debhelper tools have reported what they installed (with files per package) [ 438s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 438s] If the missing files are installed by another tool, please file a bug against it. [ 438s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 438s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 438s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 438s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 438s] For a short-term work-around: Add the files to debian/not-installed [ 438s] dh_install: dh_missing --fail-missing returned exit code 2 [ 438s] debian/rules:12: recipe for target 'binary' failed [ 438s] make: *** [binary] Error 25 [ 438s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 438s] [ 438s] lamb04 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:25:14 UTC 2020. [ 438s] [ 438s] ### VM INTERACTION START ### [ 441s] [ 412.956451] sysrq: SysRq : Power Off [ 441s] [ 412.967404] reboot: Power down [ 441s] ### VM INTERACTION END ### [ 441s] [ 441s] lamb04 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:25:18 UTC 2020. [ 441s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:26:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:26:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5e0ff7db15785_2d9c2b276ec9e60c118230@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 393s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 393s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 393s] dh_install -O--fail-missing [ 393s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 393s] dh_install: This feature will be removed in compat 12. [ 394s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 394s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 394s] dh_missing: missing files, aborting [ 394s] The following debhelper tools have reported what they installed (with files per package) [ 394s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 394s] If the missing files are installed by another tool, please file a bug against it. [ 394s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 394s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 394s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 394s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 394s] For a short-term work-around: Add the files to debian/not-installed [ 394s] dh_install: dh_missing --fail-missing returned exit code 255 [ 394s] make: *** [debian/rules:12: binary] Error 255 [ 394s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 394s] [ 394s] lamb18 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:26:08 UTC 2020. [ 394s] [ 394s] ### VM INTERACTION START ### [ 397s] [ 379.740763] sysrq: SysRq : Power Off [ 397s] [ 379.748442] reboot: Power down [ 397s] ### VM INTERACTION END ### [ 397s] [ 397s] lamb18 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:26:12 UTC 2020. [ 397s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:26:31 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:26:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e0ff7dbbdb10_2d9c2b276ec9e60c118336@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 460s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 460s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 460s] dh_install -O--fail-missing [ 460s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 460s] dh_install: This feature will be removed in compat 12. [ 460s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 460s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 460s] dh_missing: missing files, aborting [ 460s] The following debhelper tools have reported what they installed (with files per package) [ 460s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 460s] If the missing files are installed by another tool, please file a bug against it. [ 460s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 460s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 460s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 460s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 460s] For a short-term work-around: Add the files to debian/not-installed [ 460s] dh_install: dh_missing --fail-missing returned exit code 255 [ 460s] make: *** [debian/rules:12: binary] Error 255 [ 460s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 460s] [ 460s] lamb02 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:26:10 UTC 2020. [ 460s] [ 460s] ### VM INTERACTION START ### [ 463s] [ 441.771000] sysrq: SysRq : Power Off [ 463s] [ 441.779983] reboot: Power down [ 463s] ### VM INTERACTION END ### [ 463s] [ 463s] lamb02 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:26:14 UTC 2020. [ 463s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 02:27:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 02:27:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5e0ff833e697b_2d9c2b276ec9e60c11849a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 503s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 503s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 503s] dh_install -O--fail-missing [ 503s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 503s] dh_install: This feature will be removed in compat 12. [ 504s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 504s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 504s] dh_missing: missing files, aborting [ 504s] The following debhelper tools have reported what they installed (with files per package) [ 504s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 504s] If the missing files are installed by another tool, please file a bug against it. [ 504s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 504s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 504s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 504s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 504s] For a short-term work-around: Add the files to debian/not-installed [ 504s] dh_install: dh_missing --fail-missing returned exit code 2 [ 504s] make: *** [debian/rules:12: binary] Error 25 [ 504s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 504s] [ 504s] lamb24 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:27:43 UTC 2020. [ 504s] [ 504s] ### VM INTERACTION START ### [ 507s] [ 483.277909] sysrq: SysRq : Power Off [ 507s] [ 483.284362] reboot: Power down [ 507s] ### VM INTERACTION END ### [ 507s] [ 507s] lamb24 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 02:27:46 UTC 2020. [ 507s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 03:45:39 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 03:45:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e100a7921e91_2d9c2b276ec9e60c124843@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 391s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 391s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 391s] dh_install -O--fail-missing [ 391s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 391s] dh_install: This feature will be removed in compat 12. [ 392s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 392s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 392s] dh_missing: missing files, aborting [ 392s] The following debhelper tools have reported what they installed (with files per package) [ 392s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 392s] If the missing files are installed by another tool, please file a bug against it. [ 392s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 392s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 392s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 392s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 392s] For a short-term work-around: Add the files to debian/not-installed [ 392s] dh_install: dh_missing --fail-missing returned exit code 255 [ 392s] make: *** [debian/rules:12: binary] Error 255 [ 392s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 392s] [ 392s] lamb62 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 03:45:23 UTC 2020. [ 392s] [ 392s] ### VM INTERACTION START ### [ 395s] [ 377.152459] sysrq: SysRq : Power Off [ 395s] [ 377.159580] reboot: Power down [ 395s] ### VM INTERACTION END ### [ 395s] [ 395s] lamb62 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 03:45:27 UTC 2020. [ 395s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 07:01:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 07:01:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5e10386cb7bcf_2d9c2b276ec9e60c148165@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 296s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 296s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 296s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 296s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 296s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 296s] make[4]: Nothing to be done for 'install-exec-am'. [ 296s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 296s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 296s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 296s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 296s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 296s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 296s] dh_install -O--fail-missing [ 297s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 297s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 297s] dh_install: missing files, aborting [ 297s] debian/rules:12: recipe for target 'binary' failed [ 297s] make: *** [binary] Error 2 [ 297s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 297s] [ 297s] lamb10 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:01:41 UTC 2020. [ 297s] [ 297s] ### VM INTERACTION START ### [ 300s] [ 285.879343] sysrq: SysRq : Power Off [ 300s] [ 285.888339] reboot: Power down [ 300s] ### VM INTERACTION END ### [ 300s] [ 300s] lamb10 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:01:45 UTC 2020. [ 300s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 07:02:48 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 07:02:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5e1038a67ee17_2d9c2b276ec9e60c148271@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 368s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 368s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 368s] dh_install -O--fail-missing [ 368s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 368s] dh_install: This feature will be removed in compat 12. [ 368s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 368s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 368s] dh_missing: missing files, aborting [ 368s] The following debhelper tools have reported what they installed (with files per package) [ 368s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 368s] If the missing files are installed by another tool, please file a bug against it. [ 368s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 368s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 368s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 368s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 368s] For a short-term work-around: Add the files to debian/not-installed [ 368s] dh_install: dh_missing --fail-missing returned exit code 2 [ 368s] make: *** [debian/rules:12: binary] Error 25 [ 368s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 368s] [ 368s] lamb26 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:02:34 UTC 2020. [ 368s] [ 368s] ### VM INTERACTION START ### [ 371s] [ 352.506598] sysrq: SysRq : Power Off [ 371s] [ 352.512787] reboot: Power down [ 371s] ### VM INTERACTION END ### [ 371s] [ 371s] lamb26 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:02:38 UTC 2020. [ 371s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 07:03:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 07:03:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5e1038e4aade2_2d9c2b276ec9e60c14834e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 346s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 346s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 346s] dh_install -O--fail-missing [ 346s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 346s] dh_install: This feature will be removed in compat 12. [ 346s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 346s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 346s] dh_missing: missing files, aborting [ 346s] The following debhelper tools have reported what they installed (with files per package) [ 346s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 346s] If the missing files are installed by another tool, please file a bug against it. [ 346s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 346s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 346s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 346s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 346s] For a short-term work-around: Add the files to debian/not-installed [ 346s] dh_install: dh_missing --fail-missing returned exit code 2 [ 346s] make: *** [debian/rules:12: binary] Error 25 [ 346s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 346s] [ 346s] lamb23 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:03:46 UTC 2020. [ 346s] [ 346s] ### VM INTERACTION START ### [ 350s] [ 333.517460] sysrq: SysRq : Power Off [ 350s] [ 333.524648] reboot: Power down [ 350s] ### VM INTERACTION END ### [ 350s] [ 350s] lamb23 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:03:50 UTC 2020. [ 350s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 07:04:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 07:04:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5e103903405df_2d9c2b276ec9e60c148444@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 378s] dh_install -O--fail-missing [ 378s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 378s] dh_install: This feature will be removed in compat 12. [ 379s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 379s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 379s] dh_missing: missing files, aborting [ 379s] The following debhelper tools have reported what they installed (with files per package) [ 379s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 379s] If the missing files are installed by another tool, please file a bug against it. [ 379s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 379s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 379s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 379s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 379s] For a short-term work-around: Add the files to debian/not-installed [ 379s] dh_install: dh_missing --fail-missing returned exit code 2 [ 379s] debian/rules:12: recipe for target 'binary' failed [ 379s] make: *** [binary] Error 25 [ 379s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 379s] [ 379s] lamb58 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:03:54 UTC 2020. [ 379s] [ 379s] ### VM INTERACTION START ### [ 382s] [ 367.274768] sysrq: SysRq : Power Off [ 382s] [ 367.280299] reboot: Power down [ 382s] ### VM INTERACTION END ### [ 382s] [ 382s] lamb58 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:03:58 UTC 2020. [ 382s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 07:05:22 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 07:05:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5e10393d619b0_2d9c2b276ec9e60c1486e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 400s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 400s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 400s] dh_install -O--fail-missing [ 400s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 400s] dh_install: This feature will be removed in compat 12. [ 400s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 400s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 400s] dh_missing: missing files, aborting [ 400s] The following debhelper tools have reported what they installed (with files per package) [ 400s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 400s] If the missing files are installed by another tool, please file a bug against it. [ 400s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 400s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 400s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 400s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 400s] For a short-term work-around: Add the files to debian/not-installed [ 400s] dh_install: dh_missing --fail-missing returned exit code 2 [ 400s] make: *** [debian/rules:12: binary] Error 25 [ 400s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 400s] [ 400s] lamb27 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:05:01 UTC 2020. [ 400s] [ 400s] ### VM INTERACTION START ### [ 404s] [ 387.594445] sysrq: SysRq : Power Off [ 404s] [ 387.601661] reboot: Power down [ 404s] ### VM INTERACTION END ### [ 404s] [ 404s] lamb27 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 07:05:05 UTC 2020. [ 404s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 09:15:22 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 09:15:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5e1057b36bfc1_2d9c2b276ec9e60c155350@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 772s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 772s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 772s] make[4]: Nothing to be done for 'install-exec-am'. [ 772s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 772s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 772s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 772s] dh_install -O--fail-missing [ 773s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 773s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 773s] dh_install: missing files, aborting [ 773s] debian/rules:12: recipe for target 'binary' failed [ 773s] make: *** [binary] Error 2 [ 773s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 773s] [ 773s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 09:15:10 UTC 2020. [ 773s] [ 773s] ### VM INTERACTION START ### [ 776s] [ 745.489254] sysrq: SysRq : Power Off [ 776s] [ 745.505860] reboot: Power down [ 777s] ### VM INTERACTION END ### [ 777s] [ 777s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 09:15:14 UTC 2020. [ 777s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 09:47:39 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 09:47:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e105f5167bbc_2d9c2b276ec9e60c1560b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 1070s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1070s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1070s] dh_install -O--fail-missing [ 1070s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 1070s] dh_install: This feature will be removed in compat 12. [ 1070s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 1070s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 1070s] dh_missing: missing files, aborting [ 1070s] The following debhelper tools have reported what they installed (with files per package) [ 1070s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 1070s] If the missing files are installed by another tool, please file a bug against it. [ 1070s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 1070s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 1070s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 1070s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 1070s] For a short-term work-around: Add the files to debian/not-installed [ 1070s] dh_install: dh_missing --fail-missing returned exit code 2 [ 1070s] make: *** [debian/rules:12: binary] Error 25 [ 1070s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1070s] [ 1070s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 09:47:23 UTC 2020. [ 1070s] [ 1070s] ### VM INTERACTION START ### [ 1073s] [ 1026.323584] sysrq: SysRq : Power Off [ 1073s] [ 1026.328511] reboot: Power down [ 1075s] ### VM INTERACTION END ### [ 1075s] [ 1075s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 09:47:28 UTC 2020. [ 1075s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 10:24:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 10:24:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5e1067ded4ad9_2d9c2b276ec9e60c15831f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 772s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 772s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 772s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 772s] make[4]: Nothing to be done for 'install-exec-am'. [ 772s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 772s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 772s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 772s] dh_install -O--fail-missing [ 773s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 773s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 773s] dh_install: missing files, aborting [ 773s] debian/rules:12: recipe for target 'binary' failed [ 773s] make: *** [binary] Error 2 [ 773s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 773s] [ 773s] armbuild13 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 10:23:58 UTC 2020. [ 773s] [ 773s] ### VM INTERACTION START ### [ 776s] [ 711.396586] sysrq: SysRq : Power Off [ 776s] [ 711.398741] reboot: Power down [ 776s] ### VM INTERACTION END ### [ 776s] [ 776s] armbuild13 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 10:24:02 UTC 2020. [ 776s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 4 10:26:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jan 2020 10:26:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/armv7l In-Reply-To: References: Message-ID: <5e10685867e8e_2d9c2b276ec9e60c15846c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 898s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 898s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 898s] dh_install -O--fail-missing [ 898s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 898s] dh_install: This feature will be removed in compat 12. [ 898s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 898s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 898s] dh_missing: missing files, aborting [ 898s] The following debhelper tools have reported what they installed (with files per package) [ 898s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 898s] If the missing files are installed by another tool, please file a bug against it. [ 898s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 898s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 898s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 898s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 898s] For a short-term work-around: Add the files to debian/not-installed [ 898s] dh_install: dh_missing --fail-missing returned exit code 2 [ 898s] make: *** [debian/rules:12: binary] Error 25 [ 898s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 898s] [ 898s] armbuild17 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 10:26:06 UTC 2020. [ 898s] [ 898s] ### VM INTERACTION START ### [ 902s] [ 825.407196] sysrq: SysRq : Power Off [ 902s] [ 825.409044] reboot: Power down [ 902s] ### VM INTERACTION END ### [ 902s] [ 902s] armbuild17 failed "build osmo-remsim_0.2.2.dsc" at Sat Jan 4 10:26:09 UTC 2020. [ 902s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jan 4 11:50:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jan 2020 11:50:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity ...................................................................... MSC_Tests.ttcn: introduce TC_mm_id_resp_no_identity While investigating OS#4340, it was discovered that a malformed MM Identity Request with MI Type '111'B crashes OsmoMSC. Unfortunately, I could not find a way to encode such an invalid message in TITAN (because value '111'B is reserved), so I figured out that '000'B also crashes OsmoMSC. MM Identity Request is triggered by initiating an Update Location Request with reserved TMSI value 'FFFFFFFF'O (unknown to the MSC). Change-Id: I62f23355eb91df2edf9dc837c928cb86b530b743 Related: OS#4340 --- M msc/MSC_Tests.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e0d9c7f..c2a5bbb 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5778,6 +5778,43 @@ vc_conn.done; } +friend function f_tc_mm_id_resp_no_identity(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + pars.tmsi := 'FFFFFFFF'O; + f_init_handler(pars); + + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Initiate Location Updating using an unknown TMSI */ + f_bssap_compl_l3(f_build_lu_tmsi(pars.tmsi)); + + /* Expect an Identity Request, send response with no identity */ + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_MM_ID_Rsp({ + lengthIndicator := 1, + mobileIdentityV := { + typeOfIdentity := '000'B, + oddEvenInd_identity := { + no_identity := { + oddevenIndicator := '0'B, + fillerDigits := '00000'H + } + } + } + }))); + + f_expect_lu_reject(); + f_expect_clear(); +} +testcase TC_mm_id_resp_no_identity() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_tc_mm_id_resp_no_identity), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -5910,6 +5947,7 @@ execute( TC_lu_and_mt_call_osmux() ); } execute( TC_invalid_mgcp_crash() ); + execute( TC_mm_id_resp_no_identity() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 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: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 4 14:36:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jan 2020 14:36:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/1/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/1/pcu/PCU_Tests_RAW.ttcn at 1400 PS1, Line 1400: log setverdict(fail, "Wrong ..."); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 04 Jan 2020 14:36:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 4 21:08:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jan 2020 21:08:57 +0000 Subject: Change in osmo-e1d[master]: add e1-prbs-test References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16735 ) Change subject: add e1-prbs-test ...................................................................... add e1-prbs-test Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 --- A contrib/e1-prbs-test/Makefile A contrib/e1-prbs-test/README A contrib/e1-prbs-test/internal.h A contrib/e1-prbs-test/prbs.c A contrib/e1-prbs-test/rx.c A contrib/e1-prbs-test/tx.c A contrib/e1-prbs-test/utils.c 7 files changed, 668 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/35/16735/1 diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile new file mode 100644 index 0000000..e692880 --- /dev/null +++ b/contrib/e1-prbs-test/Makefile @@ -0,0 +1,19 @@ +LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore) +LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore) + +CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) +LIBS=$(LIBOSMO_LIBS) + +all: e1-prbs-test-tx e1-prbs-test-rx + +e1-prbs-test-tx: tx.o prbs.o utils.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + +e1-prbs-test-rx: rx.o prbs.o utils.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + +%.o: %.c + $(CC) $(CFLAGS) -o $@ -c $^ + +clean: + @rm -f e1-prbs-test-tx e1-prbs-test-rx *.o diff --git a/contrib/e1-prbs-test/README b/contrib/e1-prbs-test/README new file mode 100644 index 0000000..c2f78df --- /dev/null +++ b/contrib/e1-prbs-test/README @@ -0,0 +1,32 @@ +e1-prbs-test - Utility to test for bit errors on E1 lines using DAHDI +====================================================================== + +e1-prbs-test can be used to test for bit errors in E1 transmission +lines. It consists of a sender (e1-prbs-test-tx) and a receiver +(e1-prbs-test-rx), which should be used on either end of the E1 line. + +Transmitter and receiver can be on the same machine, or on different +machines. + +The code currently works directly on DAHDI, so only DAHDI-supported E1 +cards are supported at this point. + +The test works by sending timeslot-specific PRBS sequences of 512 bit +(64byte) length on the transmit side, and by correlating to those PRBS +sequences on the receiver side. + +The use is relatively simple: + +For the transmit side, assuming you would want to use DAHDI span 1: + e1-prbs-test-tx /dev/dahdi/chan/001 + +For the transmit side, assuming you would want to use DAHDI span 2: + e1-prbs-test-rx /dev/dahdi/chan/002 + +The test will run indefinitely. + +If you'd like to get an interim report, send a SIGHUP to +e1-prbs-test-rx. If you'd like to stop, simply press ctrl+c on +e1-prbs-test-rx. Make sure you terminate e1-prbs-test-rx first. If you +terminate e1-prbs-test-tx before e1-prbs-test-rx, it will negatively +affect your test results. diff --git a/contrib/e1-prbs-test/internal.h b/contrib/e1-prbs-test/internal.h new file mode 100644 index 0000000..b3f1874 --- /dev/null +++ b/contrib/e1-prbs-test/internal.h @@ -0,0 +1,18 @@ +#pragma once + +#define PRBS_LEN 512 + +struct prbs_precomp { + uint8_t bytes[PRBS_LEN/8]; +}; + +/* prbs.c */ +#include +void prbs_for_ts_nr(struct osmo_prbs *prbs, uint8_t ts_nr); + +void prbs_precomp(struct prbs_precomp *out, const struct osmo_prbs *prbs); + +/* utils.c */ +uint8_t bits_set_in_byte(uint8_t byte); +void cfg_dahdi_buffer(int fd); +void set_realtime(int rt_prio); diff --git a/contrib/e1-prbs-test/prbs.c b/contrib/e1-prbs-test/prbs.c new file mode 100644 index 0000000..1a2c3d3 --- /dev/null +++ b/contrib/e1-prbs-test/prbs.c @@ -0,0 +1,103 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include + +#include "internal.h" + +/* according to https://users.ece.cmu.edu/~koopman/lfsr/index.html all below + * coefficients should render maximal length LFSRs of 9bit (512) length */ + +const uint32_t prbs9_coeff[] = { + 0x108, + 0x10D, + 0x110, + 0x116, + 0x119, + 0x12C, + 0x12F, + 0x134, + 0x137, + 0x13B, + 0x13E, + 0x143, + 0x14A, + 0x151, + 0x152, + 0x157, + 0x15B, + 0x15E, + 0x167, + 0x168, + 0x16D, + 0x17A, + 0x17C, + 0x189, + 0x18A, + 0x18F, + 0x191, + 0x198, + 0x19D, + 0x1A7, + 0x1AD, + 0x1B0, + 0x1B5, + 0x1B6, + 0x1B9, + 0x1BF, + 0x1C2, + 0x1C7, + 0x1DA, + 0x1DC, + 0x1E3, + 0x1E5, + 0x1E6, + 0x1EA, + 0x1EC, + 0x1F1, + 0x1F4, + 0x1FD +}; + +/* build the PRBS description for a given timeslot number */ +void prbs_for_ts_nr(struct osmo_prbs *prbs, uint8_t ts_nr) +{ + OSMO_ASSERT(ts_nr < ARRAY_SIZE(prbs9_coeff)); + + prbs->name = "custom"; + prbs->len = 9; + prbs->coeff = prbs9_coeff[ts_nr]; +} + +/* compute one full sequence of the given PRBS */ +void prbs_precomp(struct prbs_precomp *out, const struct osmo_prbs *prbs) +{ + struct osmo_prbs_state prbs_s; + int i; + + osmo_prbs_state_init(&prbs_s, prbs); + for (i = 0; i < sizeof(out->bytes); i++) { + ubit_t ubit[8]; + osmo_prbs_get_ubits(ubit, sizeof(ubit), &prbs_s); + osmo_ubit2pbit(&out->bytes[i], ubit, sizeof(ubit)); + } +} diff --git a/contrib/e1-prbs-test/rx.c b/contrib/e1-prbs-test/rx.c new file mode 100644 index 0000000..29fbcbe --- /dev/null +++ b/contrib/e1-prbs-test/rx.c @@ -0,0 +1,261 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "internal.h" + +#define MAX_NR_TS 31 + +struct timeslot_state { + struct osmo_fd ofd; + struct osmo_prbs prbs; /* PRBS definition */ + struct prbs_precomp prbs_pc[8]; /* bit-shifted pre-computed PRBS sequences */ + struct { + bool has_sync; /* do we have a PRBS sync? */ + struct timespec ts_sync; /* time at which sync was established */ + unsigned int prbs_pc_num; /* index to prbs_pc[] array */ + unsigned int prbs_pc_offset; /* offset of next byte into prbs_pc[pc_num].bytes[] */ + + unsigned int num_bit_err; /* bit errors since last sync */ + unsigned int num_sync_loss; /* number of sync losses since start */ + } sync_state; +}; + +struct test_state { + struct timeslot_state ts[MAX_NR_TS]; + unsigned int next_unused_ts; +}; +static struct test_state g_tst; + +static uint8_t next_prbs_pc_byte(struct timeslot_state *ts) +{ + const struct prbs_precomp *pc = &ts->prbs_pc[ts->sync_state.prbs_pc_num]; + uint8_t ret = pc->bytes[ts->sync_state.prbs_pc_offset]; + ts->sync_state.prbs_pc_offset = (ts->sync_state.prbs_pc_offset + 1) % sizeof(pc->bytes); + return ret; +} + +/* compare if received buffer matches PRBS; count number of different bits */ +static unsigned int compare_buf(struct timeslot_state *ts, const uint8_t *data, unsigned int len) +{ + unsigned int i, num_wrong_bits = 0; + + for (i = 0; i < len; i++) { + uint8_t bt = next_prbs_pc_byte(ts); + if (data[i] != bt) { + uint8_t x = data[i] ^ bt; + num_wrong_bits += bits_set_in_byte(x); + } + } + return num_wrong_bits; +} + +/* process incoming received data; try to correlate with prbs sequence */ +static void process_rx(struct timeslot_state *ts, const uint8_t *data, unsigned int len) +{ + if (!ts->sync_state.has_sync) { + unsigned int pc_num; + /* we haven't synced yet and must attempt to sync to the pattern. We will try + * to match each pattern */ + for (pc_num = 0; pc_num < ARRAY_SIZE(ts->prbs_pc); pc_num++) { + const struct prbs_precomp *pc = &ts->prbs_pc[pc_num]; + uint8_t *found; + long int offset; + + OSMO_ASSERT(len > sizeof(pc->bytes)); + found = memmem(data, len, pc->bytes, sizeof(pc->bytes)); + if (!found) + continue; + + offset = (found - data); + printf("E1TS(%02u) FOUND SYNC (pc_num=%u, offset=%li)\n", ts->ofd.priv_nr, + pc_num, offset); + clock_gettime(CLOCK_MONOTONIC, &ts->sync_state.ts_sync); + ts->sync_state.has_sync = true; + ts->sync_state.prbs_pc_num = pc_num; + ts->sync_state.prbs_pc_offset = (sizeof(pc->bytes) - offset) % sizeof(pc->bytes); + ts->sync_state.num_bit_err = 0; + /* we will compare the full buffer below in the 'has_sync' path */ + break; + } + } + if (ts->sync_state.has_sync) { + unsigned int num_wrong_bits; + /* we already have sync */ + num_wrong_bits = compare_buf(ts, data, len); + if (num_wrong_bits >= len*8/4) { /* more than 25% of wrong bits */ + struct timespec ts_now; + clock_gettime(CLOCK_MONOTONIC, &ts_now); + printf("E1TS(%02u) LOST SYNC after %u of %u wrong bits in one buffer; " + "until now, total bit errors %u in %lu seconds\n", + ts->ofd.priv_nr, num_wrong_bits, len*8, ts->sync_state.num_bit_err, + ts_now.tv_sec - ts->sync_state.ts_sync.tv_sec); + ts->sync_state.has_sync = false; + ts->sync_state.num_sync_loss++; + } + ts->sync_state.num_bit_err += num_wrong_bits; + } +} + +static int e1_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct timeslot_state *ts = ofd->data; + uint8_t buf[4096]; + int rc, len; + + OSMO_ASSERT(what & OSMO_FD_READ); + + /* read whatever data */ + rc = read(ofd->fd, buf, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, "E1TS(%d) read: %d (%s)\n", ofd->priv_nr, rc, strerror(errno)); + return rc; + } + len = rc; + process_rx(ts, buf, len); + + return 0; +} + +static int open_slots(struct test_state *tst, const char *basedir) +{ + DIR *dir = opendir(basedir); + struct dirent *ent; + int rc, num_slots = 0; + + if (!dir) + return -ENOENT; + + while ((ent = readdir(dir))) { + struct timeslot_state *ts; + switch (ent->d_type) { + case DT_CHR: + case DT_FIFO: + case DT_SOCK: + break; + default: + printf("%s: skipping\n", ent->d_name); + continue; + } + + rc = openat(dirfd(dir), ent->d_name, O_RDWR); + if (rc < 0) { + fprintf(stderr, "Error opening %s: %d (%s)\n", ent->d_name, rc, strerror(errno)); + return -1; + } + ts = &tst->ts[tst->next_unused_ts++]; + + /* open the respective file descriptor */ + osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name)); + osmo_fd_register(&ts->ofd); + printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); + + /* initialize the PRNG for this slot */ + ubit_t ubit[PRBS_LEN*2]; + prbs_for_ts_nr(&ts->prbs, ts->ofd.priv_nr); + prbs_precomp(&ts->prbs_pc[0], &ts->prbs); + osmo_pbit2ubit(ubit, ts->prbs_pc[0].bytes, PRBS_LEN); + /* copy buffer twice back-to-back */ + memcpy(ubit+PRBS_LEN, ubit, PRBS_LEN); + + cfg_dahdi_buffer(ts->ofd.fd); + struct dahdi_bufferinfo bi; + rc = ioctl(ts->ofd.fd, DAHDI_GET_BUFINFO, &bi); + OSMO_ASSERT(rc == 0); + printf("tx_pol=%d, rx_pol=%d, num=%d, size=%d, nread=%d, nwrite=%d\n", + bi.txbufpolicy, bi.rxbufpolicy, bi.numbufs, bi.bufsize, bi.readbufs, bi.writebufs); + /* pre-compute bit-shifted versions */ + for (int i = 1; i < ARRAY_SIZE(ts->prbs_pc); i++) { + osmo_ubit2pbit_ext(ts->prbs_pc[i].bytes, 0, ubit, i, PRBS_LEN, 0); + //printf("%d: %s\n", i, osmo_hexdump_nospc(ts->prbs_pc[i].bytes, sizeof(ts->prbs_pc[i].bytes))); + } + num_slots++; + } + closedir(dir); + return num_slots; +} + +static void print_report(void) +{ + struct timespec ts_now; + int i; + + clock_gettime(CLOCK_MONOTONIC, &ts_now); + + for (i = 0; i < ARRAY_SIZE(g_tst.ts); i++) { + const struct timeslot_state *ts = &g_tst.ts[i]; + printf("E1TS(%02u) STATS: sync_losses=%u, bit_errs=%u in %lu seconds\n", + ts->ofd.priv_nr, ts->sync_state.num_sync_loss, ts->sync_state.num_bit_err, + ts_now.tv_sec - ts->sync_state.ts_sync.tv_sec); + } +} + +static void sig_handler(int signal) +{ + switch (signal) { + case SIGINT: + print_report(); + exit(0); + break; + case SIGHUP: + print_report(); + break; + } +} + +int main(int argc, char **argv) +{ + char *basedir; + int rc; + + if (argc < 2) + exit(1); + basedir = argv[1]; + + set_realtime(10); + rc = open_slots(&g_tst, basedir); + printf("==> opened a total of %d slots\n", rc); + + signal(SIGINT, sig_handler); + signal(SIGHUP, sig_handler); + while (1) { + osmo_select_main(0); + } +} diff --git a/contrib/e1-prbs-test/tx.c b/contrib/e1-prbs-test/tx.c new file mode 100644 index 0000000..5848e76 --- /dev/null +++ b/contrib/e1-prbs-test/tx.c @@ -0,0 +1,169 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "internal.h" + +#define MAX_NR_TS 31 + +/* pre-compute the PRBS sequences only once at startup */ +#define PRBS_PRECOMP + +struct timeslot_state { + struct osmo_fd ofd; + struct osmo_prbs prbs; +#ifdef PRBS_PRECOMP + struct prbs_precomp prbs_pc; + unsigned int prbs_pc_idx; +#else + struct osmo_prbs_state prbs_s; +#endif +}; + +struct test_state { + struct timeslot_state ts[MAX_NR_TS]; + unsigned int next_unused_ts; +}; +static struct test_state g_tst; + + +static void e1_fd_write(struct timeslot_state *ts, int len) +{ + uint8_t buf[4096]; + int i, rc; + + for (i = 0; i < len; i++) { +#ifdef PRBS_PRECOMP + buf[i] = ts->prbs_pc.bytes[ts->prbs_pc_idx]; + ts->prbs_pc_idx = (ts->prbs_pc_idx + 1) % sizeof(ts->prbs_pc); +#else + ubit_t ubit[8]; + osmo_prbs_get_ubits(ubit, sizeof(ubit), &ts->prbs_s); + osmo_ubit2pbit(&buf[i], ubit, sizeof(ubit)); +#endif + } + rc = write(ts->ofd.fd, buf, len); + if (rc != len) + fprintf(stderr, "E1TS(%02u) write: %d bytes less than %d\n", ts->ofd.priv_nr, rc, len); +} + +static int e1_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct timeslot_state *ts = ofd->data; + uint8_t buf[4096]; + int rc, len; + + OSMO_ASSERT(what & OSMO_FD_READ); + + /* read whatever data */ + rc = read(ofd->fd, buf, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, "E1TS(%02u) read: %d (%s)\n", ofd->priv_nr, rc, strerror(errno)); + return rc; + } + len = rc; + + /* generate as many bytes as were read */ + e1_fd_write(ts, len); + return 0; +} + +static int open_slots(struct test_state *tst, const char *basedir) +{ + DIR *dir = opendir(basedir); + struct dirent *ent; + int rc, num_slots = 0; + + if (!dir) + return -ENOENT; + + while ((ent = readdir(dir))) { + struct timeslot_state *ts; + switch (ent->d_type) { + case DT_CHR: + case DT_FIFO: + case DT_SOCK: + break; + default: + printf("%s: skipping\n", ent->d_name); + continue; + } + + rc = openat(dirfd(dir), ent->d_name, O_RDWR); + if (rc < 0) { + fprintf(stderr, "Error opening %s: %d (%s)\n", ent->d_name, rc, strerror(errno)); + return -1; + } + ts = &tst->ts[tst->next_unused_ts++]; + + /* open the respective file descriptor */ + osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name)); + osmo_fd_register(&ts->ofd); + printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); + + /* start to put something into the transmit queue, before we get read-triggered + * later on */ + e1_fd_write(ts, 1024); + + /* initialize the PRNG for this slot */ + prbs_for_ts_nr(&ts->prbs, ts->ofd.priv_nr); +#ifdef PRBS_PRECOMP + prbs_precomp(&ts->prbs_pc, &ts->prbs); +#else + osmo_prbs_state_init(&ts->prbs_s, &ts->prbs); +#endif + + num_slots++; + } + closedir(dir); + return num_slots; +} + +int main(int argc, char **argv) +{ + char *basedir; + int rc; + + if (argc < 2) + exit(1); + basedir = argv[1]; + + set_realtime(11); + rc = open_slots(&g_tst, basedir); + printf("opened a total of %d slots\n", rc); + + while (1) { + osmo_select_main(0); + } +} diff --git a/contrib/e1-prbs-test/utils.c b/contrib/e1-prbs-test/utils.c new file mode 100644 index 0000000..5610e80 --- /dev/null +++ b/contrib/e1-prbs-test/utils.c @@ -0,0 +1,66 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +/* we could generate a lookup table at start ... */ +uint8_t bits_set_in_byte(uint8_t byte) +{ + uint8_t ret = 0; + int i; + + for (i = 0; i < 8; i++) { + if (byte & (1 << i)) + ret += 1; + } + return ret; +} + +void cfg_dahdi_buffer(int fd) +{ + struct dahdi_bufferinfo bi = { + .txbufpolicy = DAHDI_POLICY_WHEN_FULL, /* default is immediate */ + .rxbufpolicy = DAHDI_POLICY_WHEN_FULL, /* default is immediate */ + .numbufs = 8, /* default is 2 */ + .bufsize = 1024, /* default is 1024 */ + .readbufs = -1, + .writebufs = -1, + }; + OSMO_ASSERT(ioctl(fd, DAHDI_SET_BUFINFO, &bi) == 0); +} + +void set_realtime(int rt_prio) +{ + struct sched_param param; + int rc; + + memset(¶m, 0, sizeof(param)); + param.sched_priority = rt_prio; + rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); + OSMO_ASSERT(rc == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 Gerrit-Change-Number: 16735 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 4 22:11:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jan 2020 22:11:34 +0000 Subject: Change in osmo-e1d[master]: contrib: add e1-prbs-test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 to look at the new patch set (#2). Change subject: contrib: add e1-prbs-test ...................................................................... contrib: add e1-prbs-test e1-prbs-test is a small utility that can be used to do PRBS testing on E1/T1 lines using DAHDI cards. A transmiter and receiver are exchanging timeslot-specific PRBS sequences. Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 --- A contrib/e1-prbs-test/Makefile A contrib/e1-prbs-test/README A contrib/e1-prbs-test/internal.h A contrib/e1-prbs-test/main.c A contrib/e1-prbs-test/prbs.c A contrib/e1-prbs-test/rx.c A contrib/e1-prbs-test/tx.c A contrib/e1-prbs-test/utils.c 8 files changed, 709 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/35/16735/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 Gerrit-Change-Number: 16735 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 5 04:42:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:42:53 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169573cf47_2d9c2b276ec9e60c3001a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Testing/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 11s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 11s] querying package ids... [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] installing [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] exit ... [ 11s] [ 11s] build74 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 04:42:44 UTC 2020. [ 11s] [ 11s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 11s] ### VM INTERACTION START ### [ 14s] [ 5.658167] sysrq: SysRq : Power Off [ 14s] [ 5.660395] reboot: Power down [ 14s] ### VM INTERACTION END ### [ 14s] [ 14s] build74 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 04:42:47 UTC 2020. [ 14s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:42:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:42:53 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116957871a6_2d9c2b276ec9e60c3002f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Testing/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build70 failed "build libasn1c_0.9.32.dsc" at Sun Jan 5 04:42:46 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.475056] sysrq: SysRq : Power Off [ 17s] [ 6.477693] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build70 failed "build libasn1c_0.9.32.dsc" at Sun Jan 5 04:42:50 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:10 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116976968a4_2d9c2b276ec9e60c300413@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] cloud127 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 04:43:01 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.866085] sysrq: SysRq : Power Off [ 25s] [ 7.872552] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] cloud127 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 04:43:05 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:10 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11697757ba_2d9c2b276ec9e60c30057c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Testing/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build77 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Jan 5 04:43:02 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 18s] [ 6.935385] sysrq: SysRq : Power Off [ 18s] [ 6.938402] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] build77 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Jan 5 04:43:07 UTC 2020. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:10 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11697767e66_2d9c2b276ec9e60c300663@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] cloud129 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 04:43:04 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 29s] [ 7.653268] sysrq: SysRq : Power Off [ 29s] [ 7.682884] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] cloud129 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 04:43:08 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:10 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116977dbe80_2d9c2b276ec9e60c300746@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Testing/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmocom-latest_0.0.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-latest_0.0.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb13 failed "build osmocom-latest_0.0.0.dsc" at Sun Jan 5 04:42:54 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.443580] sysrq: SysRq : Power Off [ 21s] [ 7.452436] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb13 failed "build osmocom-latest_0.0.0.dsc" at Sun Jan 5 04:42:57 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:10 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169783c942_2d9c2b276ec9e60c3008d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Testing/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmocore_1.3.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb17 failed "build libosmocore_1.3.0.dsc" at Sun Jan 5 04:42:57 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.491347] sysrq: SysRq : Power Off [ 22s] [ 7.502542] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb17 failed "build libosmocore_1.3.0.dsc" at Sun Jan 5 04:43:00 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:27 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11697899b3b_2d9c2b276ec9e60c300917@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] build35 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 04:43:11 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.563274] sysrq: SysRq : Power Off [ 23s] [ 7.574267] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] build35 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 04:43:14 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:27 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169794c5a8_2d9c2b276ec9e60c301074@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] wildcard2 failed "build libosmocore_1.3.0.3.57d11.dsc" at Sun Jan 5 04:43:18 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 6.708848] sysrq: SysRq : Power Off [ 23s] [ 6.711810] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] wildcard2 failed "build libosmocore_1.3.0.3.57d11.dsc" at Sun Jan 5 04:43:22 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:27 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11697999318_2d9c2b276ec9e60c301112@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] installing [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build82 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 04:43:19 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.307899] sysrq: SysRq : Power Off [ 17s] [ 6.309971] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build82 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 04:43:23 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:27 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116979e4f6d_2d9c2b276ec9e60c3012e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] installing [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] exit ... [ 13s] [ 13s] build80 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sun Jan 5 04:43:20 UTC 2020. [ 13s] [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] ### VM INTERACTION START ### [ 16s] [ 5.937887] sysrq: SysRq : Power Off [ 16s] [ 5.939942] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] build80 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sun Jan 5 04:43:23 UTC 2020. [ 16s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:27 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11697a50ec3_2d9c2b276ec9e60c301383@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmocom-nightly_0.0.0.20200105.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-nightly_0.0.0.20200105.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb11 failed "build osmocom-nightly_0.0.0.20200105.dsc" at Sun Jan 5 04:43:22 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.476838] sysrq: SysRq : Power Off [ 22s] [ 7.482793] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb11 failed "build osmocom-nightly_0.0.0.20200105.dsc" at Sun Jan 5 04:43:26 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:nightly/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116993c48f7_2d9c2b276ec9e60c30145a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Debian_Testing/x86_64 Package network:osmocom:nightly/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb27 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 04:43:32 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.906437] sysrq: SysRq : Power Off [ 22s] [ 7.918645] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb27 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 04:43:36 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11699434a3e_2d9c2b276ec9e60c3015a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] cloud113 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 04:43:35 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 30s] [ 8.813742] sysrq: SysRq : Power Off [ 30s] [ 8.830940] reboot: Power down [ 30s] ### VM INTERACTION END ### [ 30s] [ 30s] cloud113 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 04:43:39 UTC 2020. [ 30s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169948a74c_2d9c2b276ec9e60c3016c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 24s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] cloud120 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 04:43:36 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 28s] [ 7.858178] sysrq: SysRq : Power Off [ 28s] [ 7.862818] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] cloud120 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 04:43:39 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116994d1efc_2d9c2b276ec9e60c301783@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 22s] [ 22s] lamb65 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Sun Jan 5 04:43:36 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.795465] sysrq: SysRq : Power Off [ 25s] [ 7.801388] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb65 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Sun Jan 5 04:43:40 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11699530910_2d9c2b276ec9e60c30182a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 29s] running base-passwd preinstall script [ 29s] running base-passwd postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running user-setup postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running base-files postinstall script [ 29s] running gawk postinstall script [ 30s] querying package ids... [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] installing [ 30s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] exit ... [ 30s] [ 30s] cloud125 failed "build libasn1c_0.9.32.dsc" at Sun Jan 5 04:43:38 UTC 2020. [ 30s] [ 30s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 30s] ### VM INTERACTION START ### [ 33s] [ 7.800345] sysrq: SysRq : Power Off [ 33s] [ 7.805547] reboot: Power down [ 33s] ### VM INTERACTION END ### [ 33s] [ 33s] cloud125 failed "build libasn1c_0.9.32.dsc" at Sun Jan 5 04:43:41 UTC 2020. [ 33s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:43:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:43:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116995a2d2a_2d9c2b276ec9e60c3019ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/osmo-python-tests_0.0.9.20200105.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-python-tests_0.0.9.20200105.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/208] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] wildcard2 failed "build osmo-python-tests_0.0.9.20200105.dsc" at Sun Jan 5 04:43:24 UTC 2020. [ 17s] [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.628304] sysrq: SysRq : Power Off [ 20s] [ 6.631254] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] wildcard2 failed "build osmo-python-tests_0.0.9.20200105.dsc" at Sun Jan 5 04:43:28 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169964c7f_2d9c2b276ec9e60c3020d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb72 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sun Jan 5 04:43:40 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.805965] sysrq: SysRq : Power Off [ 22s] [ 7.813534] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb72 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sun Jan 5 04:43:44 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e11699666d56_2d9c2b276ec9e60c3021ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb74 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Sun Jan 5 04:43:46 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.823774] sysrq: SysRq : Power Off [ 24s] [ 7.831742] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb74 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Sun Jan 5 04:43:49 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:02 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116996d7005_2d9c2b276ec9e60c302217@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Testing/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb11 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 04:43:54 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.466783] sysrq: SysRq : Power Off [ 22s] [ 7.476596] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb11 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 04:43:58 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116997349c2_2d9c2b276ec9e60c3023e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb17 failed "build osmo-pcap_0.1.2.dsc" at Sun Jan 5 04:43:56 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.612114] sysrq: SysRq : Power Off [ 22s] [ 7.617871] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb17 failed "build osmo-pcap_0.1.2.dsc" at Sun Jan 5 04:43:59 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:19 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169b0e7437_2d9c2b276ec9e60c3024ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb18 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 04:43:58 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 23s] [ 7.645124] sysrq: SysRq : Power Off [ 23s] [ 7.652609] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb18 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 04:44:02 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:19 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169b15bac6_2d9c2b276ec9e60c3025fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Testing/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb53 failed "build simtrace2_0.5.2.dsc" at Sun Jan 5 04:44:02 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.720690] sysrq: SysRq : Power Off [ 22s] [ 7.726648] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb53 failed "build simtrace2_0.5.2.dsc" at Sun Jan 5 04:44:05 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169d0938e1_2d9c2b276ec9e60c3027bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb25 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 04:44:44 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.276292] sysrq: SysRq : Power Off [ 27s] [ 8.286736] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb25 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 04:44:48 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:44:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:44:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169d0464e0_2d9c2b276ec9e60c30269@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb58 failed "build osmo-sip-connector_1.4.0.dsc" at Sun Jan 5 04:44:44 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.146827] sysrq: SysRq : Power Off [ 27s] [ 8.165376] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb58 failed "build osmo-sip-connector_1.4.0.dsc" at Sun Jan 5 04:44:47 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169ef9409c_2d9c2b276ec9e60c3028c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc ... [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 12s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build74 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Sun Jan 5 04:45:02 UTC 2020. [ 12s] [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.719591] sysrq: SysRq : Power Off [ 15s] [ 5.721692] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build74 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Sun Jan 5 04:45:05 UTC 2020. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169efdb949_2d9c2b276ec9e60c3029d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 33s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 33s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 33s] running base-passwd preinstall script [ 33s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 37s] [ 37s] lamb59 failed "build osmo-pcu_0.8.0.dsc" at Sun Jan 5 04:45:02 UTC 2020. [ 37s] [ 37s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 37s] ### VM INTERACTION START ### [ 40s] [ 16.054457] sysrq: SysRq : Power Off [ 40s] [ 16.064273] reboot: Power down [ 40s] ### VM INTERACTION END ### [ 40s] [ 40s] lamb59 failed "build osmo-pcu_0.8.0.dsc" at Sun Jan 5 04:45:06 UTC 2020. [ 40s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169f031472_2d9c2b276ec9e60c303016@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb51 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 04:45:02 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.490931] sysrq: SysRq : Power Off [ 25s] [ 8.498403] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb51 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 04:45:06 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:27 +0000 Subject: Build failure of network:osmocom:nightly/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169f09aab2_2d9c2b276ec9e60c303134@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/Debian_Testing/x86_64 Package network:osmocom:nightly/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] build78 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 04:45:10 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.938290] sysrq: SysRq : Power Off [ 21s] [ 7.941706] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] build78 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 04:45:14 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169f18d93_2d9c2b276ec9e60c3032ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb19 failed "build osmo-pcap_0.1.2.dsc" at Sun Jan 5 04:45:14 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.435027] sysrq: SysRq : Power Off [ 22s] [ 7.443948] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb19 failed "build osmo-pcap_0.1.2.dsc" at Sun Jan 5 04:45:17 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:27 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1169f157c4a_2d9c2b276ec9e60c3033f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb18 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 04:45:16 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.652619] sysrq: SysRq : Power Off [ 22s] [ 7.660539] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb18 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 04:45:19 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:44 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a0bd160_2d9c2b276ec9e60c3034b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 39s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 39s] running gawk postinstall script [ 39s] querying package ids... [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] cloud130 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jan 5 04:45:33 UTC 2020. [ 40s] [ 40s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 40s] ### VM INTERACTION START ### [ 43s] [ 8.026718] sysrq: SysRq : Power Off [ 43s] [ 8.037351] reboot: Power down [ 43s] ### VM INTERACTION END ### [ 43s] [ 43s] cloud130 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jan 5 04:45:37 UTC 2020. [ 43s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a0b8a247_2d9c2b276ec9e60c30359a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 15s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 15s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 15s] running base-passwd preinstall script [ 15s] running base-passwd postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running user-setup postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running base-files postinstall script [ 16s] running gawk postinstall script [ 16s] querying package ids... [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] installing [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] exit ... [ 16s] [ 16s] sheep81 failed "build osmo-bts_1.2.0.dsc" at Sun Jan 5 04:45:23 UTC 2020. [ 16s] [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] ### VM INTERACTION START ### [ 20s] [ 8.093281] sysrq: SysRq : Power Off [ 20s] [ 8.104128] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] sheep81 failed "build osmo-bts_1.2.0.dsc" at Sun Jan 5 04:45:27 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a0bf098d_2d9c2b276ec9e60c3036c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb56 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 04:45:24 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.952423] sysrq: SysRq : Power Off [ 25s] [ 7.961326] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb56 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 04:45:28 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a0c4a22c_2d9c2b276ec9e60c3037dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb62 failed "build osmo-sip-connector_1.4.0.dsc" at Sun Jan 5 04:45:24 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.124625] sysrq: SysRq : Power Off [ 26s] [ 8.142944] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb62 failed "build osmo-sip-connector_1.4.0.dsc" at Sun Jan 5 04:45:28 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:45:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:45:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a0c994c5_2d9c2b276ec9e60c3038d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb26 failed "build osmo-pcu_0.8.0.dsc" at Sun Jan 5 04:45:26 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.035642] sysrq: SysRq : Power Off [ 27s] [ 8.060604] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb26 failed "build osmo-pcu_0.8.0.dsc" at Sun Jan 5 04:45:29 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:19 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a2d1ea1b_2d9c2b276ec9e60c3041fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build73 failed "build libosmo-sccp_1.2.0.dsc" at Sun Jan 5 04:46:13 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.221945] sysrq: SysRq : Power Off [ 17s] [ 6.229050] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build73 failed "build libosmo-sccp_1.2.0.dsc" at Sun Jan 5 04:46:16 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a46f37c3_2d9c2b276ec9e60c3043d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb27 failed "build osmo-bts_1.2.0.dsc" at Sun Jan 5 04:46:29 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.251180] sysrq: SysRq : Power Off [ 26s] [ 8.267134] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb27 failed "build osmo-bts_1.2.0.dsc" at Sun Jan 5 04:46:33 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a46a7121_2d9c2b276ec9e60c3042b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb70 failed "build osmo-sysmon_0.2.0.dsc" at Sun Jan 5 04:46:27 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.478581] sysrq: SysRq : Power Off [ 21s] [ 7.485316] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb70 failed "build osmo-sysmon_0.2.0.dsc" at Sun Jan 5 04:46:31 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:36 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a4788ae2_2d9c2b276ec9e60c304464@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb23 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jan 5 04:46:22 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.701616] sysrq: SysRq : Power Off [ 22s] [ 7.706067] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb23 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jan 5 04:46:25 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a47e2873_2d9c2b276ec9e60c30454a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb09 failed "build osmo-hlr_1.2.0.dsc" at Sun Jan 5 04:46:24 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 26s] [ 7.941329] sysrq: SysRq : Power Off [ 26s] [ 7.950160] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb09 failed "build osmo-hlr_1.2.0.dsc" at Sun Jan 5 04:46:28 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a483c755_2d9c2b276ec9e60c3046d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 29s] running base-passwd preinstall script [ 29s] running base-passwd postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running user-setup postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running base-files postinstall script [ 29s] running gawk postinstall script [ 29s] querying package ids... [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] installing [ 30s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] exit ... [ 30s] [ 30s] cloud120 failed "build osmo-mgw_1.7.0.dsc" at Sun Jan 5 04:46:33 UTC 2020. [ 30s] [ 30s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 30s] ### VM INTERACTION START ### [ 33s] [ 8.055622] sysrq: SysRq : Power Off [ 33s] [ 8.074947] reboot: Power down [ 33s] ### VM INTERACTION END ### [ 33s] [ 33s] cloud120 failed "build osmo-mgw_1.7.0.dsc" at Sun Jan 5 04:46:36 UTC 2020. [ 33s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a488a6ec_2d9c2b276ec9e60c3047d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] [1/511] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] installing [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] exit ... [ 13s] [ 13s] build72 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 04:46:35 UTC 2020. [ 13s] [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] ### VM INTERACTION START ### [ 16s] [ 6.037831] sysrq: SysRq : Power Off [ 16s] [ 6.039556] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] build72 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 04:46:38 UTC 2020. [ 16s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:46:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:46:53 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a48e3c88_2d9c2b276ec9e60c3048a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 33s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 33s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 33s] running base-passwd preinstall script [ 33s] running base-passwd postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running user-setup postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running base-files postinstall script [ 34s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 36s] [ 36s] lamb02 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 04:46:38 UTC 2020. [ 36s] [ 36s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 36s] ### VM INTERACTION START ### [ 39s] [ 14.776741] sysrq: SysRq : Power Off [ 39s] [ 14.804853] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] lamb02 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 04:46:42 UTC 2020. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:47:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:47:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a8687d6e_2d9c2b276ec9e60c305085@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb10 failed "build osmo-bsc_1.6.0.dsc" at Sun Jan 5 04:47:29 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.815382] sysrq: SysRq : Power Off [ 25s] [ 7.823134] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb10 failed "build osmo-bsc_1.6.0.dsc" at Sun Jan 5 04:47:32 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:47:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:47:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a87607a4_2d9c2b276ec9e60c3051fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb09 failed "build osmo-iuh_0.6.0.dsc" at Sun Jan 5 04:47:25 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.518939] sysrq: SysRq : Power Off [ 22s] [ 7.527666] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb09 failed "build osmo-iuh_0.6.0.dsc" at Sun Jan 5 04:47:28 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:47:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:47:44 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116a88152e_2d9c2b276ec9e60c30523f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Testing/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/openbsc_1.3.2.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb26 failed "build openbsc_1.3.2.dsc" at Sun Jan 5 04:47:28 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 24s] [ 7.821032] sysrq: SysRq : Power Off [ 24s] [ 7.828805] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb26 failed "build openbsc_1.3.2.dsc" at Sun Jan 5 04:47:32 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:48:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:48:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116aa1daf62_2d9c2b276ec9e60c305367@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb13 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Sun Jan 5 04:48:09 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.559081] sysrq: SysRq : Power Off [ 22s] [ 7.575843] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb13 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Sun Jan 5 04:48:12 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:48:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:48:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116ac11e83f_2d9c2b276ec9e60c3054a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 24s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/513] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] lamb16 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Sun Jan 5 04:48:21 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 28s] [ 8.318960] sysrq: SysRq : Power Off [ 28s] [ 8.328478] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] lamb16 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Sun Jan 5 04:48:25 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:48:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:48:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116ac17c27f_2d9c2b276ec9e60c3055b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb52 failed "build osmo-hlr_1.2.0.dsc" at Sun Jan 5 04:48:22 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.246244] sysrq: SysRq : Power Off [ 27s] [ 8.254042] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb52 failed "build osmo-hlr_1.2.0.dsc" at Sun Jan 5 04:48:26 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:48:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:48:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116ac294af8_2d9c2b276ec9e60c3056b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb60 failed "build osmo-sgsn_1.6.0.dsc" at Sun Jan 5 04:48:42 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.045332] sysrq: SysRq : Power Off [ 26s] [ 8.050808] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb60 failed "build osmo-sgsn_1.6.0.dsc" at Sun Jan 5 04:48:45 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:49:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:49:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116adc36f02_2d9c2b276ec9e60c305777@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 27s] running base-passwd preinstall script [ 27s] running base-passwd postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running user-setup postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running base-files postinstall script [ 27s] running gawk postinstall script [ 28s] querying package ids... [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] installing [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] exit ... [ 29s] [ 29s] lamb57 failed "build osmo-mgw_1.7.0.dsc" at Sun Jan 5 04:48:56 UTC 2020. [ 29s] [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] ### VM INTERACTION START ### [ 32s] [ 9.405870] sysrq: SysRq : Power Off [ 32s] [ 9.418237] reboot: Power down [ 32s] ### VM INTERACTION END ### [ 32s] [ 32s] lamb57 failed "build osmo-mgw_1.7.0.dsc" at Sun Jan 5 04:49:00 UTC 2020. [ 32s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:49:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:49:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116adcd3215_2d9c2b276ec9e60c3058bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/osmo-msc_1.6.0.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] installing [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] exit ... [ 35s] [ 35s] cloud126 failed "build osmo-msc_1.6.0.dsc" at Sun Jan 5 04:48:50 UTC 2020. [ 35s] [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] ### VM INTERACTION START ### [ 39s] [ 8.127022] sysrq: SysRq : Power Off [ 39s] [ 8.132818] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] cloud126 failed "build osmo-msc_1.6.0.dsc" at Sun Jan 5 04:48:54 UTC 2020. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:49:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:49:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116add393cd_2d9c2b276ec9e60c30597b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb51 failed "build libosmo-sccp_1.2.0.dsc" at Sun Jan 5 04:48:54 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.339109] sysrq: SysRq : Power Off [ 27s] [ 8.356526] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb51 failed "build libosmo-sccp_1.2.0.dsc" at Sun Jan 5 04:48:58 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:50:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:50:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116b39a4397_2d9c2b276ec9e60c3061ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] build36 failed "build osmo-iuh_0.6.0.dsc" at Sun Jan 5 04:50:32 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.447553] sysrq: SysRq : Power Off [ 23s] [ 7.458699] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] build36 failed "build osmo-iuh_0.6.0.dsc" at Sun Jan 5 04:50:35 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:50:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:50:53 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116b3a2f552_2d9c2b276ec9e60c30629f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Testing/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/openbsc_1.3.2.20200105.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.20200105.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] cloud132 failed "build openbsc_1.3.2.20200105.dsc" at Sun Jan 5 04:50:35 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.751239] sysrq: SysRq : Power Off [ 25s] [ 7.755878] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] cloud132 failed "build openbsc_1.3.2.20200105.dsc" at Sun Jan 5 04:50:39 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:51:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:51:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116b547b985_2d9c2b276ec9e60c306475@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 32s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 32s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 32s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 32s] running base-passwd preinstall script [ 32s] running base-passwd postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running user-setup postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running base-files postinstall script [ 32s] running gawk postinstall script [ 33s] querying package ids... [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] installing [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] exit ... [ 34s] [ 34s] cloud125 failed "build osmo-bsc_1.6.0.dsc" at Sun Jan 5 04:50:53 UTC 2020. [ 34s] [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] ### VM INTERACTION START ### [ 37s] [ 8.179172] sysrq: SysRq : Power Off [ 37s] [ 8.183607] reboot: Power down [ 37s] ### VM INTERACTION END ### [ 37s] [ 37s] cloud125 failed "build osmo-bsc_1.6.0.dsc" at Sun Jan 5 04:50:57 UTC 2020. [ 37s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:52:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:52:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116b748a663_2d9c2b276ec9e60c306743@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 35s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 36s] [ 36s] cloud127 failed "build osmo-sgsn_1.6.0.dsc" at Sun Jan 5 04:51:52 UTC 2020. [ 36s] [ 36s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 36s] ### VM INTERACTION START ### [ 39s] [ 9.252493] sysrq: SysRq : Power Off [ 39s] [ 9.256375] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] cloud127 failed "build osmo-sgsn_1.6.0.dsc" at Sun Jan 5 04:51:56 UTC 2020. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 04:52:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 04:52:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e116b74310b4_2d9c2b276ec9e60c306694@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-msc_1.6.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb18 failed "build osmo-msc_1.6.0.dsc" at Sun Jan 5 04:51:46 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 26s] [ 7.961593] sysrq: SysRq : Power Off [ 26s] [ 7.973321] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb18 failed "build osmo-msc_1.6.0.dsc" at Sun Jan 5 04:51:50 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 05:03:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 05:03:27 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e116e255fd5f_2d9c2b276ec9e60c3073cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 418s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] dh_install -O--fail-missing [ 418s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 418s] dh_install: This feature will be removed in compat 12. [ 418s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 418s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 418s] dh_missing: missing files, aborting [ 418s] The following debhelper tools have reported what they installed (with files per package) [ 418s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 418s] If the missing files are installed by another tool, please file a bug against it. [ 418s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 418s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 418s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 418s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 418s] For a short-term work-around: Add the files to debian/not-installed [ 418s] dh_install: dh_missing --fail-missing returned exit code 255 [ 418s] make: *** [debian/rules:12: binary] Error 255 [ 418s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 418s] [ 418s] lamb62 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 05:03:09 UTC 2020. [ 418s] [ 418s] ### VM INTERACTION START ### [ 421s] [ 402.566833] sysrq: SysRq : Power Off [ 421s] [ 402.574279] reboot: Power down [ 421s] ### VM INTERACTION END ### [ 421s] [ 421s] lamb62 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 05:03:12 UTC 2020. [ 421s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:08:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:08:34 +0000 Subject: Change in docker-playground[master]: add dahdi-source to debian-stretch-build container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16736 ) Change subject: add dahdi-source to debian-stretch-build container ...................................................................... add dahdi-source to debian-stretch-build container ... otherwise modern libosmo-abis builds will fail. Change-Id: Ia1f0f59ba1c6ab0edcd06a7c0f939c00bdd1f738 Closes: OS#4344 --- M debian-stretch-build/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/16736/1 diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index a4526f7..c1fe92b 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -12,6 +12,7 @@ bison \ build-essential \ cppcheck \ + dahdi-source \ debhelper \ devscripts \ dh-autoreconf \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1f0f59ba1c6ab0edcd06a7c0f939c00bdd1f738 Gerrit-Change-Number: 16736 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Jan 5 11:11:27 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 5 Jan 2020 11:11:27 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-osmo-ccid-firmware_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,a4=3Dd?= =?UTF-8?Q?efault,osmocom-master-debian9_#44?= Message-ID: <1233524664.1203.1578222687780.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:20:02 +0000 Subject: Change in docker-playground[master]: add dahdi-source to debian-stretch-build container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16736 ) Change subject: add dahdi-source to debian-stretch-build container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1f0f59ba1c6ab0edcd06a7c0f939c00bdd1f738 Gerrit-Change-Number: 16736 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:20:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:20:07 +0000 Subject: Change in docker-playground[master]: add dahdi-source to debian-stretch-build container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16736 ) Change subject: add dahdi-source to debian-stretch-build container ...................................................................... add dahdi-source to debian-stretch-build container ... otherwise modern libosmo-abis builds will fail. Change-Id: Ia1f0f59ba1c6ab0edcd06a7c0f939c00bdd1f738 Closes: OS#4344 --- M debian-stretch-build/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index a4526f7..c1fe92b 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -12,6 +12,7 @@ bison \ build-essential \ cppcheck \ + dahdi-source \ debhelper \ devscripts \ dh-autoreconf \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1f0f59ba1c6ab0edcd06a7c0f939c00bdd1f738 Gerrit-Change-Number: 16736 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:20:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:20:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Drop unneeded mp_enable_conn_timeout_test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 ) Change subject: mgw: Drop unneeded mp_enable_conn_timeout_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 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: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 Gerrit-Change-Number: 16727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:20:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ggsn: Drop unneeded m_ggsn_supports_echo_interval In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 ) Change subject: ggsn: Drop unneeded m_ggsn_supports_echo_interval ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 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: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Gerrit-Change-Number: 16729 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:21:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Drop unneeded mp_enable_conn_timeout_test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 ) Change subject: mgw: Drop unneeded mp_enable_conn_timeout_test ...................................................................... mgw: Drop unneeded mp_enable_conn_timeout_test Latest osmo-mgw release is 1.7.0, so this param is not needed at all. Furthermore, the config can be moved to .cfg. Change-Id: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 --- M mgw/MGCP_Test.ttcn M mgw/osmo-mgw.cfg 2 files changed, 2 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index b46b178..77eed4b 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -69,10 +69,6 @@ charstring mp_remote_ip := "127.0.0.1"; PortNumber mp_local_rtp_port_base := 10000; PortNumber mp_local_osmux_port := 1985; - - /* Whether to enable conn-timeout tests. Can be dropped completely and enabled unconditionally once new - * version of osmo-mgw is released (current version: 1.5.0) */ - boolean mp_enable_conn_timeout_test := true; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -95,9 +91,6 @@ f_vty_transceive(MGWVTY, "enable"); f_vty_enable_osmux(osmux_on); - if (mp_enable_conn_timeout_test) { - f_vty_config(MGWVTY, "mgcp", "conn-timeout 0"); - } } private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i) @@ -2199,8 +2192,6 @@ execute(TC_amr_oa_oa_rtp_conversion()); execute(TC_amr_bwe_bwe_rtp_conversion()); - if (mp_enable_conn_timeout_test) { - execute(TC_conn_timeout()); - } + execute(TC_conn_timeout()); } } diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index b27a50c..edc8190 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -31,6 +31,7 @@ sdp audio-payload name GSM sdp audio-payload send-ptime sdp audio-payload send-name + conn-timeout 0 loop 0 number endpoints 31 allow-transcoding -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16727 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: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 Gerrit-Change-Number: 16727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ggsn: Drop unneeded m_ggsn_supports_echo_interval In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 ) Change subject: ggsn: Drop unneeded m_ggsn_supports_echo_interval ...................................................................... ggsn: Drop unneeded m_ggsn_supports_echo_interval Latest osmo-ggsn release is 1.5.0, so this param is not needed at all. Change-Id: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 2 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 44dba4a..40506df 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -64,13 +64,6 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ - - /* - * Whether ggsn supports "(no) echo-interval" VTY command - * (osmo-ggsn.git Id2c84165dc59dff495106758146a701ca488834f). - * This option can be dropped after osmo-ggsn release > 1.4.0 exists. - */ - boolean m_ggsn_supports_echo_interval := true; } type set PdpContext { @@ -203,9 +196,7 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); - if (m_ggsn_supports_echo_interval) { - f_vty_enable_echo_interval(g_use_echo); - } + f_vty_enable_echo_interval(g_use_echo); } /* Altstep implementing responses to any incoming echo requests */ @@ -1506,8 +1497,6 @@ execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); - if (m_ggsn_supports_echo_interval) { - execute(TC_pdp_act_restart_ctr_echo()); - } + execute(TC_pdp_act_restart_ctr_echo()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16729 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: Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Gerrit-Change-Number: 16729 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:36 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16728 ) Change subject: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia457546431e0c3bb3148f4886644ed3fa2513835 Gerrit-Change-Number: 16728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:21:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:46 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16730 ) Change subject: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifb3eb642fa5547d1ce2de81f51f181e226dceed7 Gerrit-Change-Number: 16730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:21:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:21:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:21:58 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16731 ) Change subject: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ffd7549172055e6180a5c3f167dcc1133648243 Gerrit-Change-Number: 16731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:21:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:10 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn: Drop unneeded .cfg change for latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16732 ) Change subject: ttcn3-sgsn: Drop unneeded .cfg change for latest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7473de84521c37d6408ac1235244250284bd59a Gerrit-Change-Number: 16732 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:22:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:22 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Drop unneeded modifications for latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16733 ) Change subject: ttcn3-pcu: Drop unneeded modifications for latest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I774af9eb7625891d906d33a0ea0ab3ffc5973a32 Gerrit-Change-Number: 16733 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:22:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:34 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16734 ) Change subject: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c8ef08c7a60e0c83c43ea79e882dfb2d2328fa6 Gerrit-Change-Number: 16734 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 11:22:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:36 +0000 Subject: Change in docker-playground[master]: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16728 ) Change subject: ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test ...................................................................... ttcn3-mgw: Drop not longer existing mp_enable_conn_timeout_test It was removed since latest osmo-mgw release is nowadays 1.7.0. Depends: osmo-ttcn3-hacks.git I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4 Change-Id: Ia457546431e0c3bb3148f4886644ed3fa2513835 --- M ttcn3-mgw-test/MGCP_Test.cfg M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 3 files changed, 1 insertion(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index d7cdcaf..0c6a550 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -10,7 +10,6 @@ [MODULE_PARAMETERS] mp_local_ip:= "172.18.4.181"; mp_remote_ip:= "172.18.4.180"; -mp_enable_conn_timeout_test := true; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 6973377..473782f 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -10,10 +10,6 @@ mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ -# conn-timeout must be disabled until release AFTER osmo-mgw 1.5.0 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/mp_enable_conn_timeout_test := true;/mp_enable_conn_timeout_test := false;/g" -i $VOL_BASE_DIR/mgw-tester/MGCP_Test.cfg -fi mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index b410dca..c97f08a 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -37,6 +37,7 @@ sdp audio-payload name GSM sdp audio-payload send-ptime sdp audio-payload send-name + conn-timeout 0 loop 0 number endpoints 31 allow-transcoding -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia457546431e0c3bb3148f4886644ed3fa2513835 Gerrit-Change-Number: 16728 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:36 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16730 ) Change subject: ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest ...................................................................... ttcn3-stp: Drop unneeded different osmo-stp.cfg for latest Latest tagged release of libosmo-sccp, version 1.2.0, already supports the regular osmo-stp.cfg file. Change-Id: Ifb3eb642fa5547d1ce2de81f51f181e226dceed7 --- M ttcn3-stp-test/jenkins.sh D ttcn3-stp-test/latest/osmo-stp.cfg 2 files changed, 0 insertions(+), 117 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 6195e3c..939dc36 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,11 +12,6 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp -if [ "$IMAGE_SUFFIX" = "latest" ]; then - cp latest/osmo-stp.cfg $VOL_BASE_DIR/stp/ -else - cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -fi network_create 172.18.19.0/24 diff --git a/ttcn3-stp-test/latest/osmo-stp.cfg b/ttcn3-stp-test/latest/osmo-stp.cfg deleted file mode 100644 index 37c453d..0000000 --- a/ttcn3-stp-test/latest/osmo-stp.cfg +++ /dev/null @@ -1,112 +0,0 @@ -! -! OsmoSTP (1.1.0.2-3884) configuration saved from vty -!! -! -log gsmtap 172.18.19.203 - logging level set-all debug - logging filter all 1 -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all debug -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -cs7 instance 0 - point-code format 24 -! -!M3UA AS/ASP: -! - asp asp-sender 9999 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-receiver0 10000 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-receiver1 10001 2905 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp asp-client0 10002 2906 m3ua - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as as-sender m3ua - asp asp-sender - routing-key 1023 23 - as as-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 -! -! IPA AS/ASP: -! - asp ipa-asp-loadshare-sender 20000 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 -! LOADSHARE: - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender - asp ipa-asp-loadshare-receiver0 20001 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp ipa-asp-loadshare-receiver1 20002 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 -! OVERRIDE: - asp ipa-asp-override-sender 20004 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-override-sender ipa - routing-key 0 6 - point-code override dpc 33 - asp ipa-asp-override-sender - asp ipa-asp-override-receiver0 20005 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - asp ipa-asp-override-receiver1 20006 5000 ipa - local-ip 172.18.19.200 - remote-ip 172.18.19.203 - as ipa-as-override-receiver ipa - traffic-mode override - routing-key 0 8 - point-code override dpc 34 - asp ipa-asp-override-receiver0 - asp ipa-asp-override-receiver1 -! DYNAMIC AS: - as ipa-as-dynamic-asp ipa - routing-key 0 5 - point-code override dpc 23 -! -! ROUTING TABLE: -! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp -! -!SERVERS: -! - listen m3ua 2905 - accept-asp-connections dynamic-permitted - listen ipa 5000 - accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifb3eb642fa5547d1ce2de81f51f181e226dceed7 Gerrit-Change-Number: 16730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:36 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16731 ) Change subject: ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval ...................................................................... ttcn3-ggsn: Drop no longer existing m_ggsn_supports_echo_interval It was removed since latest osmo-ggsn release is nowadays 1.5.0. Depends: osmo-ttcn3-hacks.git Ie1c3cde2a01e8ea49aadcb1f7384995cb68039cb Change-Id: I9ffd7549172055e6180a5c3f167dcc1133648243 --- M ttcn3-ggsn-test/GGSN_Tests.cfg M ttcn3-ggsn-test/jenkins.sh 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg index 11c22cb..064bf37 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/GGSN_Tests.cfg @@ -18,7 +18,5 @@ # GGSN announced DNS address GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" -GGSN_Tests.m_ggsn_supports_echo_interval := true; - [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 66239f8..ac26c0f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -10,10 +10,6 @@ mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ -# VTY command "(no) echo-interval" must be disabled until osmo-ggsn.git release > 1.4.0 is available. -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/GGSN_Tests.m_ggsn_supports_echo_interval := true;/GGSN_Tests.m_ggsn_supports_echo_interval := false;/g" -i $VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg -fi mkdir $VOL_BASE_DIR/ggsn cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9ffd7549172055e6180a5c3f167dcc1133648243 Gerrit-Change-Number: 16731 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:36 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn: Drop unneeded .cfg change for latest In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16732 ) Change subject: ttcn3-sgsn: Drop unneeded .cfg change for latest ...................................................................... ttcn3-sgsn: Drop unneeded .cfg change for latest Latest libosmo-sccp release 1.2.0 already uses same id as master. Change-Id: Ib7473de84521c37d6408ac1235244250284bd59a --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 7f322f4..5464ca6 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,12 +16,6 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ -# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from -# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines -# below can be dropped: -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7473de84521c37d6408ac1235244250284bd59a Gerrit-Change-Number: 16732 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:37 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Drop unneeded modifications for latest In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16733 ) Change subject: ttcn3-pcu: Drop unneeded modifications for latest ...................................................................... ttcn3-pcu: Drop unneeded modifications for latest Latest osmo-pcu release 0.8.0 already behaves same as master. Change-Id: I774af9eb7625891d906d33a0ea0ab3ffc5973a32 --- M ttcn3-pcu-test/jenkins.sh 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 4305a8d..e0f1212 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -13,22 +13,10 @@ mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ -# Latest release of osmo-pcu (0.7.0) has prompt "Osmo-PCU", while master uses more -# usual osmocom form "OsmoPCU". This can be removed once a new osmo-pcu version is released -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/OsmoPCU/Osmo-PCU/g" -i $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg -fi mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix cp osmo-pcu.cfg $VOL_BASE_DIR/pcu/ -# Latest release of osmo-pcu (0.7.0) doesn't know some gsmtap categories -# This can be removed once a new osmo-pcu version is released -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/gsmtap-category dl-agch//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed "s/gsmtap-category dl-pch//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed "s/gsmtap-category ul-rach//g" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi mkdir $VOL_BASE_DIR/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I774af9eb7625891d906d33a0ea0ab3ffc5973a32 Gerrit-Change-Number: 16733 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:22:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:22:38 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16734 ) Change subject: ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest ...................................................................... ttcn3-sip: Drop unneeded SIP_Tests.cfg modifications for latest Latest osmo-sip-connector release 1.4.0 already behaves the same as master. Change-Id: I3c8ef08c7a60e0c83c43ea79e882dfb2d2328fa6 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 3d7d523..0bc0357 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -14,10 +14,6 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ -if [ "x${IMAGE_SUFFIX}" != "xmaster" ]; then - sed -i 's/mp_mncc_version := [0-9]*/mp_mncc_version:= 5/' "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c8ef08c7a60e0c83c43ea79e882dfb2d2328fa6 Gerrit-Change-Number: 16734 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:23:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:23:08 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_re... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16683 ) Change subject: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 05 Jan 2020 11:23:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 11:23:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 11:23:09 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_re... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16683 ) Change subject: libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() ...................................................................... libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() During the last congress, we have noticed that OsmoMSC crashes on receipt of malformed MM Identity Response messages: BSSAP Message Type: Direct Transfer (0x01) Data Link Connection Identifier 00.. .... = Control Channel: not further specified (0x0) ..00 0... = Spare: 0x0 .... .000 = SAPI: RR/MM/CC (0x0) Length: 11 GSM A-I/F DTAP - Identity Response Protocol Discriminator: Mobility Management messages (5) .... 0101 = Protocol discriminator: Mobility Management messages (0x5) 0000 .... = Skip Indicator: No indication of selected PLMN (0) 01.. .... = Sequence number: 1 ..01 1001 = DTAP Mobility Management Message Type: Identity Response (0x19) Mobile Identity - Format Unknown Length: 8 .... 1... = Odd/even indication: Odd number of identity digits .... .111 = Mobile Identity Type: Unknown (7) <-- This makes OsmoMSC crash [Expert Info (Warning/Protocol): Unknown format 7] [Unknown format 7] [Severity level: Warning] [Group: Protocol] The value '111'B is not a valid Mobile Identity type, and shall be considered as reserved according to 3GPP TS 24.008, section 10.5.1.4. Later on it was discovered that '000'B also crashes OsmoMSC in the same way. The crash itself is provoked by OSMO_ASSERT(0) in vlr_subscr_rx_id_resp(). Let's keep that assert in there, and make sure that: - on receipt of MM Identity Response, Mobile Identity type matches the one in MM Identity Request; - on receipt of RR Ciphering Mode Complete, Mobile Identity contains IMEI(SV) if present. Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 TTCN-3 test case: I62f23355eb91df2edf9dc837c928cb86b530b743 Fixes: OS#4340 --- M include/osmocom/msc/msc_a.h M src/libmsc/gsm_04_08.c 2 files changed, 39 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index a4d3226..18973f9 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -99,6 +99,9 @@ /* After Ciphering Mode Complete on GERAN, this reflects the chosen ciphering algorithm and key */ struct geran_encr geran_encr; + /* Type of MI requested in MM Identity Request */ + uint8_t mm_id_req_type; + /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ uint8_t n_sd_next[4]; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 750c766..b284ccd 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -182,6 +182,7 @@ struct gsm48_hdr *gh = msgb_l3(msg); uint8_t *mi = gh->data+1; uint8_t mi_len = gh->data[0]; + uint8_t mi_type; struct vlr_subscr *vsub = msc_a_vsub(msc_a); if (!vsub) { @@ -190,6 +191,28 @@ return -EINVAL; } + /* There muct be at least one octet with MI type */ + if (!mi_len) { + LOGP(DMM, LOGL_NOTICE, "MM Identity Response contains " + "malformed Mobile Identity\n"); + return -EINVAL; + } + + /* Make sure we got what we expected */ + mi_type = mi[0] & GSM_MI_TYPE_MASK; + if (mi_type == GSM_MI_TYPE_NONE) { + LOGP(DMM, LOGL_NOTICE, "MM Identity Response contains no identity, " + "perhaps the MS has no Mobile Identity type %s?\n", + gsm48_mi_type_name(msc_a->mm_id_req_type)); + return -EINVAL; + } else if (mi_type != msc_a->mm_id_req_type) { + LOGP(DMM, LOGL_NOTICE, "MM Identity Response contains unexpected " + "Mobile Identity type %s (extected %s)\n", + gsm48_mi_type_name(mi_type), + gsm48_mi_type_name(msc_a->mm_id_req_type)); + return -EINVAL; + } + DEBUGP(DMM, "IDENTITY RESPONSE: MI=%s\n", osmo_mi_name(mi, mi_len)); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data); @@ -1182,8 +1205,17 @@ tlv_parse(&tp, &gsm48_att_tlvdef, gh->data, payload_len, 0, 0); mi = TLVP_GET(&tp, GSM48_IE_MOBILE_ID); + /* IMEI(SV) is optional for this message */ if (!mi) return 0; + if (!mi->len) + return -EINVAL; + if ((mi->val[0] & GSM_MI_TYPE_MASK) != GSM_MI_TYPE_IMEISV) { + LOGP(DMM, LOGL_ERROR, "RR Ciphering Mode Complete contains " + "unexpected Mobile Identity type %s\n", + gsm48_mi_type_name(mi->val[0] & GSM_MI_TYPE_MASK)); + return -EINVAL; + } LOG_MSC_A(msc_a, LOGL_DEBUG, "RR Ciphering Mode Complete contains Mobile Identity: %s\n", osmo_mi_name(mi->val, mi->len)); @@ -1287,6 +1319,10 @@ static int msc_vlr_tx_id_req(void *msc_conn_ref, uint8_t mi_type) { struct msc_a *msc_a = msc_conn_ref; + + /* Store requested MI type, so we can check the response */ + msc_a->mm_id_req_type = mi_type; + return mm_tx_identity_req(msc_a, mi_type); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d6a1046_2d9c2b276ec9e60c4407f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 36s] querying package ids... [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] installing [ 37s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] exit ... [ 37s] [ 37s] lamb51 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 16:02:56 UTC 2020. [ 37s] [ 37s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 37s] ### VM INTERACTION START ### [ 40s] [ 13.713125] sysrq: SysRq : Power Off [ 40s] [ 13.750775] reboot: Power down [ 40s] ### VM INTERACTION END ### [ 40s] [ 40s] lamb51 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 16:03:00 UTC 2020. [ 40s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:02:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:02:44 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208b674462_2d9c2b276ec9e60c44022a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb66 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 16:02:39 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.461700] sysrq: SysRq : Power Off [ 21s] [ 7.472365] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb66 failed "build libosmodsp_0.4.0.dsc" at Sun Jan 5 16:02:42 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d8aa8a7_2d9c2b276ec9e60c441263@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Testing/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 24s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] lamb61 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 16:02:46 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 29s] [ 10.264483] sysrq: SysRq : Power Off [ 29s] [ 10.271362] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb61 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 16:02:50 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d778f7f_2d9c2b276ec9e60c44091a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb65 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 16:02:43 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.640164] sysrq: SysRq : Power Off [ 22s] [ 7.646806] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb65 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 16:02:47 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:02:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:02:27 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12089caffd8_2d9c2b276ec9e60c440169@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 12s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build75 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 16:02:23 UTC 2020. [ 12s] [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.817465] sysrq: SysRq : Power Off [ 15s] [ 5.819974] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build75 failed "build libsmpp34_1.14.0.dsc" at Sun Jan 5 16:02:26 UTC 2020. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d7cf019_2d9c2b276ec9e60c4410c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb19 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sun Jan 5 16:02:43 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 10.759931] sysrq: SysRq : Power Off [ 27s] [ 10.779589] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb19 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sun Jan 5 16:02:47 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:02:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:02:44 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208b6bef01_2d9c2b276ec9e60c4403a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Testing/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmocore_1.3.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb68 failed "build libosmocore_1.3.0.dsc" at Sun Jan 5 16:02:40 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.421905] sysrq: SysRq : Power Off [ 22s] [ 7.429482] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb68 failed "build libosmocore_1.3.0.dsc" at Sun Jan 5 16:02:43 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d720ea1_2d9c2b276ec9e60c44082b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] build31 failed "build libosmocore_1.3.0.3.57d11.dsc" at Sun Jan 5 16:02:40 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 29s] [ 8.194492] sysrq: SysRq : Power Off [ 29s] [ 8.198310] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] build31 failed "build libosmocore_1.3.0.3.57d11.dsc" at Sun Jan 5 16:02:43 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:02:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:02:44 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208b73654f_2d9c2b276ec9e60c4404a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] build70 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 16:02:26 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 23s] [ 8.988593] sysrq: SysRq : Power Off [ 23s] [ 9.002747] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] build70 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 16:02:30 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:02:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:02:44 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208b8273ad_2d9c2b276ec9e60c44063@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] build79 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sun Jan 5 16:02:32 UTC 2020. [ 17s] [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] ### VM INTERACTION START ### [ 20s] [ 8.544379] sysrq: SysRq : Power Off [ 20s] [ 8.559272] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] build79 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sun Jan 5 16:02:35 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1209136c970_2d9c2b276ec9e60c4423b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 24s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] lamb07 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 16:04:11 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 28s] [ 8.628904] sysrq: SysRq : Power Off [ 28s] [ 8.634544] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] lamb07 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 16:04:15 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:10 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1209128e61f_2d9c2b276ec9e60c44218a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Testing/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb15 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 16:04:03 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 8.070254] sysrq: SysRq : Power Off [ 24s] [ 8.085599] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb15 failed "build yder_1.4.4-4.1.dsc" at Sun Jan 5 16:04:07 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:10 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e120911e9c67_2d9c2b276ec9e60c442042@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] build75 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 16:03:53 UTC 2020. [ 17s] [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] ### VM INTERACTION START ### [ 20s] [ 6.825645] sysrq: SysRq : Power Off [ 20s] [ 6.829045] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] build75 failed "build libosmo-netif_0.7.0.dsc" at Sun Jan 5 16:03:57 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208f62ed71_2d9c2b276ec9e60c44168a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 15s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 15s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 15s] running base-passwd preinstall script [ 15s] running base-passwd postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running user-setup postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running base-files postinstall script [ 15s] running gawk postinstall script [ 15s] querying package ids... [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] installing [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] exit ... [ 16s] [ 16s] build74 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 16:03:19 UTC 2020. [ 16s] [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] ### VM INTERACTION START ### [ 19s] [ 6.885510] sysrq: SysRq : Power Off [ 19s] [ 6.889280] reboot: Power down [ 19s] ### VM INTERACTION END ### [ 19s] [ 19s] build74 failed "build osmo-ggsn_1.5.0.dsc" at Sun Jan 5 16:03:23 UTC 2020. [ 19s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1209132080e_2d9c2b276ec9e60c4422a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 23s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb20 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Sun Jan 5 16:04:10 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 28s] [ 11.588543] sysrq: SysRq : Power Off [ 28s] [ 11.602192] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] lamb20 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Sun Jan 5 16:04:15 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e120911567ef_2d9c2b276ec9e60c441832@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb08 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 16:03:51 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 10.890833] sysrq: SysRq : Power Off [ 27s] [ 10.927454] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb08 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 16:03:55 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:04:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:04:27 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1209145574f_2d9c2b276ec9e60c44258d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Testing/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 75s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 75s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 75s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 75s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 75s] running base-passwd preinstall script [ 75s] running base-passwd postinstall script [ 75s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 75s] running user-setup postinstall script [ 75s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 75s] running base-files postinstall script [ 75s] running gawk postinstall script [ 77s] querying package ids... [ 77s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 77s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 78s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 78s] installing [ 78s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 78s] exit ... [ 78s] [ 78s] lamb52 failed "build simtrace2_0.5.2.dsc" at Sun Jan 5 16:04:23 UTC 2020. [ 78s] [ 78s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 78s] ### VM INTERACTION START ### [ 81s] [ 16.376163] sysrq: SysRq : Power Off [ 81s] [ 16.419862] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb52 failed "build simtrace2_0.5.2.dsc" at Sun Jan 5 16:04:26 UTC 2020. [ 81s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:nightly/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d95d92f_2d9c2b276ec9e60c44134e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Debian_Testing/x86_64 Package network:osmocom:nightly/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb70 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 16:02:51 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.562980] sysrq: SysRq : Power Off [ 22s] [ 7.571070] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb70 failed "build orcania_1.2.9-5.dsc" at Sun Jan 5 16:02:54 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:02 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208d84e025_2d9c2b276ec9e60c4411f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb70 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 16:02:46 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.719180] sysrq: SysRq : Power Off [ 22s] [ 7.725140] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb70 failed "build libgtpnl_1.2.1.dsc" at Sun Jan 5 16:02:49 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 5 16:03:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 16:03:19 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1208daa123c_2d9c2b276ec9e60c441432@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] build31 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 16:03:13 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 9.194369] sysrq: SysRq : Power Off [ 25s] [ 9.202167] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] build31 failed "build libosmo-abis_0.8.0.dsc" at Sun Jan 5 16:03:16 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 5 18:41:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 18:41:04 +0000 Subject: Change in docker-playground[master]: Add debian-buster-erlang container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16737 ) Change subject: Add debian-buster-erlang container ...................................................................... Add debian-buster-erlang container The idea for this is to be used in build verification for erlang projects. We also include C compiler and common utilities for those projects or upstream dependencies that may require it. Change-Id: I06c11a188404e183ed04bacf1673ecef2dc9ca47 --- A debian-buster-erlang/Dockerfile A debian-buster-erlang/Makefile A debian-buster-erlang/Release.key 3 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/16737/1 diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile new file mode 100644 index 0000000..ed20b37 --- /dev/null +++ b/debian-buster-erlang/Dockerfile @@ -0,0 +1,50 @@ +FROM debian:buster + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/" + +# install the erlang vm and rebar (2) +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get -y install \ + erlang \ + rebar + +# add rebar3 +ADD https://s3.amazonaws.com/rebar3/rebar3 /usr/bin/rebar3 +RUN chmod 0755 /usr/bin/rebar3 + +# install ninimal build utilities as well as system utilities +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + git \ + procps \ + tcpdump \ + vim \ + netcat-openbsd \ + wget \ + && \ + apt-get clean + +# install additional C-language / system dependencies of our Erlang projects +RUN apt-get update && \ + apt-get -y install \ + libpcap-dev \ + && \ + apt-get clean + +# add osmocom latest repo, should we ever require packages from there +RUN apt-get update && apt-get install -y \ + gnupg +COPY Release.key /tmp/Release.key +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release + +# add a non-root user under which we will normaly execute build tests +RUN useradd -m osmocom +WORKDIR /home/osmocom +USER osmocom diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-erlang/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/debian-buster-erlang/Release.key b/debian-buster-erlang/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-buster-erlang/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06c11a188404e183ed04bacf1673ecef2dc9ca47 Gerrit-Change-Number: 16737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 18:44:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 18:44:01 +0000 Subject: Change in osmo-ggsn[master]: cosmetic: fix formatting in if line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 ) Change subject: cosmetic: fix formatting in if line ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/15302/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ggsn/+/15302/1//COMMIT_MSG at 10 PS1, Line 10: Fixes: 2d6a69e69a4b4cb2b8cc63c4810dae44e5a4d8f6 > AFAIK the'Fixes:' tag should reference an issue number. I'd rather say "Introduced in eefa...". ACK! -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9ee5f4142cacf912145693c72a53c0f531bad2c6 Gerrit-Change-Number: 15302 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 18:44:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 18:44:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 18:44:44 +0000 Subject: Change in osmocom-bb[master]: mobile: Fix encoding of cause in gsm480_tx_release_compl() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/14853 ) Change subject: mobile: Fix encoding of cause in gsm480_tx_release_compl() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/14853/1/src/host/layer23/src/mobile/gsm480_ss.c File src/host/layer23/src/mobile/gsm480_ss.c: https://gerrit.osmocom.org/c/osmocom-bb/+/14853/1/src/host/layer23/src/mobile/gsm480_ss.c at 404 PS1, Line 404: tlv[2] = 0x80 | cause; : tlv[3] = 0x80 | GSM48_CAUSE_LOC_USER; > An idea for another change: cause should actually go after location. Please see section 10.5.4. [?] https://gerrit.osmocom.org/c/osmocom-bb/+/14879 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iba2ace7d82be5677d28b25f60ab0312fed76f5e5 Gerrit-Change-Number: 14853 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 18:44:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 19:28:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jan 2020 19:28:02 +0000 Subject: Change in docker-playground[master]: Add debian-buster-erlang container In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16737 ) Change subject: Add debian-buster-erlang container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 Successfully compiled my SMSC :) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06c11a188404e183ed04bacf1673ecef2dc9ca47 Gerrit-Change-Number: 16737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 19:28:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 20:02:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jan 2020 20:02:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 ) Change subject: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS ...................................................................... MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS The SMSC Address in template t_SmsPars has been changed since [1]. That change caused test case failures because OsmoMSC hard-codes a different SMSC Address. Let's fix this. [1] Ia60bdd2498034b6b849f874cf1eee272abef2b47 Change-Id: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/16738/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index ccebba1..eae5e56 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1660,8 +1660,9 @@ rp := { msg_ref := '42'O, /* We don't really need to have both SM-RP-DA/OA here, because only one IE - * is included in MO/MT SMS, and in the most cases it's the SMSC address. */ - smsc_addr := t_RP_Addr('76722337'H) + * is included in MO/MT SMS, and in the most cases it's the SMSC address. + * NOTE: this address is currently hard-coded by OsmoMSC. */ + smsc_addr := t_RP_Addr('447785016005'H) }, tid := 0, dlci := '03'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 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: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b Gerrit-Change-Number: 16738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 20:02:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jan 2020 20:02:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 ) Change subject: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 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: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b Gerrit-Change-Number: 16738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 05 Jan 2020 20:02:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 20:11:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jan 2020 20:11:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 to look at the new patch set (#2). Change subject: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS ...................................................................... MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS Since [1] we started to match the SMSC Address in f_mt_sms_expect(). That change caused test case failures because OsmoMSC hard-codes a different SMSC Address. Let's fix this. [1] Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Change-Id: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/16738/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 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: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b Gerrit-Change-Number: 16738 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 20:12:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jan 2020 20:12:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 ) Change subject: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 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: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b Gerrit-Change-Number: 16738 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jan 2020 20:12:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 5 20:12:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jan 2020 20:12:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 ) Change subject: MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS ...................................................................... MSC: fix SM-RP-OA (SMSC Address) expectations for MT SMS Since [1] we started to match the SMSC Address in f_mt_sms_expect(). That change caused test case failures because OsmoMSC hard-codes a different SMSC Address. Let's fix this. [1] Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Change-Id: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index ccebba1..eae5e56 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1660,8 +1660,9 @@ rp := { msg_ref := '42'O, /* We don't really need to have both SM-RP-DA/OA here, because only one IE - * is included in MO/MT SMS, and in the most cases it's the SMSC address. */ - smsc_addr := t_RP_Addr('76722337'H) + * is included in MO/MT SMS, and in the most cases it's the SMSC address. + * NOTE: this address is currently hard-coded by OsmoMSC. */ + smsc_addr := t_RP_Addr('447785016005'H) }, tid := 0, dlci := '03'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16738 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: I3bdb6a74c8b02e4bf8dc88634e2380c924242b4b Gerrit-Change-Number: 16738 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 5 22:03:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jan 2020 22:03:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e125d52d7180_2d9c2b276ec9e60c485136@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 438s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 438s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 438s] dh_install -O--fail-missing [ 438s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 438s] dh_install: This feature will be removed in compat 12. [ 438s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 438s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 438s] dh_missing: missing files, aborting [ 438s] The following debhelper tools have reported what they installed (with files per package) [ 438s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 438s] If the missing files are installed by another tool, please file a bug against it. [ 438s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 438s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 438s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 438s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 438s] For a short-term work-around: Add the files to debian/not-installed [ 438s] dh_install: dh_missing --fail-missing returned exit code 255 [ 438s] make: *** [debian/rules:12: binary] Error 255 [ 438s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 438s] [ 438s] lamb25 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 22:03:49 UTC 2020. [ 438s] [ 438s] ### VM INTERACTION START ### [ 441s] [ 424.076603] sysrq: SysRq : Power Off [ 441s] [ 424.091957] reboot: Power down [ 441s] ### VM INTERACTION END ### [ 441s] [ 441s] lamb25 failed "build osmo-remsim_0.2.2.dsc" at Sun Jan 5 22:03:52 UTC 2020. [ 441s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:31:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:31:48 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e11e9de2_2d9c2b276ec9e60c5099d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmocom-nightly_0.0.0.20200106.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-nightly_0.0.0.20200106.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb12 failed "build osmocom-nightly_0.0.0.20200106.dsc" at Mon Jan 6 01:31:40 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.446665] sysrq: SysRq : Power Off [ 21s] [ 7.453249] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb12 failed "build osmocom-nightly_0.0.0.20200106.dsc" at Mon Jan 6 01:31:43 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:32:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:32:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e50a7784_2d9c2b276ec9e60c510145@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc ... [ 11s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 11s] querying package ids... [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build78 failed "build libosmocore_1.3.0.3.57d11.dsc" at Mon Jan 6 01:32:20 UTC 2020. [ 12s] [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.583480] sysrq: SysRq : Power Off [ 15s] [ 5.585688] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build78 failed "build libosmocore_1.3.0.3.57d11.dsc" at Mon Jan 6 01:32:23 UTC 2020. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:32:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:32:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e511dc87_2d9c2b276ec9e60c5102aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build83 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 01:32:23 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 5.757709] sysrq: SysRq : Power Off [ 17s] [ 5.759562] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build83 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 01:32:26 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:33:13 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e6b9cc70_2d9c2b276ec9e60c51032d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb56 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 01:33:07 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 8.144874] sysrq: SysRq : Power Off [ 23s] [ 8.157715] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb56 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 01:33:11 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:33:13 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e6cbce17_2d9c2b276ec9e60c5105a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb28 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 01:33:07 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.504183] sysrq: SysRq : Power Off [ 22s] [ 7.512277] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb28 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 01:33:10 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e8d2681a_2d9c2b276ec9e60c51089@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb74 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 01:33:22 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.418549] sysrq: SysRq : Power Off [ 21s] [ 7.427263] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb74 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 01:33:26 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:33:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:33:48 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128e8dcea4e_2d9c2b276ec9e60c5109ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb65 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 01:33:30 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.446140] sysrq: SysRq : Power Off [ 21s] [ 7.455184] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb65 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 01:33:33 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128ea886226_2d9c2b276ec9e60c511181@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb28 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 01:33:51 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.747621] sysrq: SysRq : Power Off [ 23s] [ 7.762344] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb28 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 01:33:55 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:34:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128ec94436c_2d9c2b276ec9e60c511410@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb71 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 01:34:47 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.487369] sysrq: SysRq : Power Off [ 22s] [ 7.496695] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb71 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 01:34:50 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:34:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128ec996eb0_2d9c2b276ec9e60c5115e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb72 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 01:34:48 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.660525] sysrq: SysRq : Power Off [ 25s] [ 7.672099] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb72 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 01:34:51 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:34:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128ec9e00cc_2d9c2b276ec9e60c5116b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] cloud119 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 01:34:48 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 29s] [ 7.974204] sysrq: SysRq : Power Off [ 29s] [ 7.980948] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] cloud119 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 01:34:51 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:35:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:35:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f02cd2c2_2d9c2b276ec9e60c511839@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb26 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 01:35:19 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.877158] sysrq: SysRq : Power Off [ 26s] [ 7.883929] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb26 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 01:35:23 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f034586d_2d9c2b276ec9e60c51195f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Testing/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/openbsc_1.3.2.20200106.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.20200106.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb15 failed "build openbsc_1.3.2.20200106.dsc" at Mon Jan 6 01:35:32 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.638292] sysrq: SysRq : Power Off [ 21s] [ 7.646977] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb15 failed "build openbsc_1.3.2.20200106.dsc" at Mon Jan 6 01:35:35 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f03e87b5_2d9c2b276ec9e60c512022@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb71 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 01:35:42 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.594421] sysrq: SysRq : Power Off [ 21s] [ 7.600790] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb71 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 01:35:45 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f229e92c_2d9c2b276ec9e60c5121ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb72 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 01:35:47 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.898071] sysrq: SysRq : Power Off [ 24s] [ 7.905572] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb72 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 01:35:50 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f23466f_2d9c2b276ec9e60c512269@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb09 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 01:35:47 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.977358] sysrq: SysRq : Power Off [ 25s] [ 7.984521] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb09 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 01:35:51 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f235a2b7_2d9c2b276ec9e60c512386@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 39s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 39s] running gawk postinstall script [ 39s] querying package ids... [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] cloud123 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 01:35:49 UTC 2020. [ 40s] [ 40s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 40s] ### VM INTERACTION START ### [ 43s] [ 7.988306] sysrq: SysRq : Power Off [ 43s] [ 7.993418] reboot: Power down [ 43s] ### VM INTERACTION END ### [ 43s] [ 43s] cloud123 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 01:35:52 UTC 2020. [ 43s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f3de5e19_2d9c2b276ec9e60c512572@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-python-tests_0.0.9.20200106.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-python-tests_0.0.9.20200106.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/208] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb15 failed "build osmo-python-tests_0.0.9.20200106.dsc" at Mon Jan 6 01:36:21 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.316401] sysrq: SysRq : Power Off [ 21s] [ 7.325216] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb15 failed "build osmo-python-tests_0.0.9.20200106.dsc" at Mon Jan 6 01:36:25 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f3f5f2c4_2d9c2b276ec9e60c5127e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 11s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build74 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 01:36:49 UTC 2020. [ 12s] [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] ### VM INTERACTION START ### [ 15s] [ 6.199219] sysrq: SysRq : Power Off [ 15s] [ 6.201912] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build74 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 01:36:52 UTC 2020. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f3eb9c10_2d9c2b276ec9e60c51266e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb64 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 01:36:38 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.843267] sysrq: SysRq : Power Off [ 24s] [ 7.850998] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb64 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 01:36:42 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:36:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:36:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f3fc5e4e_2d9c2b276ec9e60c512875@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb02 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Mon Jan 6 01:36:50 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.767729] sysrq: SysRq : Power Off [ 23s] [ 7.772657] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb02 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Mon Jan 6 01:36:53 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:37:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:37:13 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f5e9b99c_2d9c2b276ec9e60c5129b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 29s] running base-passwd preinstall script [ 29s] running base-passwd postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running user-setup postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running base-files postinstall script [ 30s] running gawk postinstall script [ 31s] querying package ids... [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] installing [ 31s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] exit ... [ 31s] [ 31s] lamb23 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Mon Jan 6 01:37:03 UTC 2020. [ 31s] [ 31s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 32s] ### VM INTERACTION START ### [ 35s] [ 12.161014] sysrq: SysRq : Power Off [ 35s] [ 12.177406] reboot: Power down [ 35s] ### VM INTERACTION END ### [ 35s] [ 35s] lamb23 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Mon Jan 6 01:37:07 UTC 2020. [ 35s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:37:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:37:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f5f248c4_2d9c2b276ec9e60c5130d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb58 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Mon Jan 6 01:36:53 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.937444] sysrq: SysRq : Power Off [ 24s] [ 7.959593] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb58 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Mon Jan 6 01:36:57 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:37:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:37:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f5fea754_2d9c2b276ec9e60c51311d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 43s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 43s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 43s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 43s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 43s] running base-passwd preinstall script [ 43s] running base-passwd postinstall script [ 43s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 43s] running user-setup postinstall script [ 44s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 44s] running base-files postinstall script [ 44s] running gawk postinstall script [ 45s] querying package ids... [ 45s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 45s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] installing [ 46s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] exit ... [ 46s] [ 46s] lamb04 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 01:37:21 UTC 2020. [ 46s] [ 46s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 46s] ### VM INTERACTION START ### [ 49s] [ 12.473331] sysrq: SysRq : Power Off [ 49s] [ 12.489545] reboot: Power down [ 49s] ### VM INTERACTION END ### [ 49s] [ 49s] lamb04 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 01:37:24 UTC 2020. [ 49s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:37:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:37:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f6041dd8_2d9c2b276ec9e60c513295@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 28s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc ... [ 28s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 28s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc build ... [ 28s] running base-passwd preinstall script [ 28s] running base-passwd postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running user-setup postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running base-files postinstall script [ 28s] running gawk postinstall script [ 28s] querying package ids... [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] installing [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] exit ... [ 29s] [ 29s] cloud113 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Mon Jan 6 01:37:21 UTC 2020. [ 29s] [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] ### VM INTERACTION START ### [ 32s] [ 7.893149] sysrq: SysRq : Power Off [ 32s] [ 7.903085] reboot: Power down [ 32s] ### VM INTERACTION END ### [ 32s] [ 32s] cloud113 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Mon Jan 6 01:37:25 UTC 2020. [ 32s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f7a7332a_2d9c2b276ec9e60c51348c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb18 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 01:37:31 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.066236] sysrq: SysRq : Power Off [ 26s] [ 8.072703] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb18 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 01:37:35 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f99c303c_2d9c2b276ec9e60c5135e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 34s] querying package ids... [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] [1/513] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] installing [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] exit ... [ 35s] [ 35s] cloud118 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 01:38:01 UTC 2020. [ 35s] [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] ### VM INTERACTION START ### [ 38s] [ 7.991495] sysrq: SysRq : Power Off [ 38s] [ 7.996445] reboot: Power down [ 38s] ### VM INTERACTION END ### [ 38s] [ 38s] cloud118 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 01:38:04 UTC 2020. [ 38s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 01:38:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 01:38:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e128f9a64d30_2d9c2b276ec9e60c5136d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb02 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 01:38:03 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.418120] sysrq: SysRq : Power Off [ 27s] [ 8.426181] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb02 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 01:38:07 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:56 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f9e653a_2d9c2b276ec9e60c5279a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Testing/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb52 failed "build orcania_1.2.9-5.dsc" at Mon Jan 6 03:30:50 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.495639] sysrq: SysRq : Power Off [ 25s] [ 8.502850] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb52 failed "build orcania_1.2.9-5.dsc" at Mon Jan 6 03:30:54 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:39 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f772b15_2d9c2b276ec9e60c5273c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Testing/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/libosmocore_1.3.0.dsc ... [ 11s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 12s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build71 failed "build libosmocore_1.3.0.dsc" at Mon Jan 6 03:30:32 UTC 2020. [ 12s] [ 12s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.824750] sysrq: SysRq : Power Off [ 15s] [ 5.826654] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build71 failed "build libosmocore_1.3.0.dsc" at Mon Jan 6 03:30:35 UTC 2020. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:56 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f8b8cf4_2d9c2b276ec9e60c5276cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Testing/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmocom-latest_0.0.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-latest_0.0.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb59 failed "build osmocom-latest_0.0.0.dsc" at Mon Jan 6 03:30:46 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 8.102121] sysrq: SysRq : Power Off [ 23s] [ 8.106729] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb59 failed "build osmocom-latest_0.0.0.dsc" at Mon Jan 6 03:30:50 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:56 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f98c53b_2d9c2b276ec9e60c5278ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] cloud118 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 03:30:50 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 9.024697] sysrq: SysRq : Power Off [ 26s] [ 9.030412] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] cloud118 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 03:30:53 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:56 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9fa79417_2d9c2b276ec9e60c5280c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] installing [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] exit ... [ 15s] [ 15s] build79 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 03:30:37 UTC 2020. [ 15s] [ 15s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 15s] ### VM INTERACTION START ### [ 18s] [ 6.501164] sysrq: SysRq : Power Off [ 18s] [ 6.503422] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] build79 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 03:30:41 UTC 2020. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:56 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f934335_2d9c2b276ec9e60c5277ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb57 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 03:30:49 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.598217] sysrq: SysRq : Power Off [ 21s] [ 7.604839] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb57 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 03:30:52 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:30:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:30:39 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12a9f81e88f_2d9c2b276ec9e60c52755f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Testing/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build84 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 03:30:33 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.612085] sysrq: SysRq : Power Off [ 17s] [ 6.621010] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build84 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 03:30:37 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa161522e_2d9c2b276ec9e60c528464@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb16 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 03:31:20 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.495109] sysrq: SysRq : Power Off [ 21s] [ 7.503462] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb16 failed "build libasn1c_0.9.32.dsc" at Mon Jan 6 03:31:23 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa1414348_2d9c2b276ec9e60c528173@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] sheep83 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 03:30:52 UTC 2020. [ 17s] [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] ### VM INTERACTION START ### [ 20s] [ 8.019157] sysrq: SysRq : Power Off [ 20s] [ 8.027290] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] sheep83 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 03:30:56 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa1778f9c_2d9c2b276ec9e60c52888e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb14 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 03:31:23 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.458893] sysrq: SysRq : Power Off [ 22s] [ 7.465504] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb14 failed "build libosmodsp_0.4.0.dsc" at Mon Jan 6 03:31:26 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa166d0ee_2d9c2b276ec9e60c5285e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Debian_Testing/x86_64 Package network:osmocom:nightly/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb08 failed "build orcania_1.2.9-5.dsc" at Mon Jan 6 03:31:21 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.506732] sysrq: SysRq : Power Off [ 21s] [ 7.513612] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb08 failed "build orcania_1.2.9-5.dsc" at Mon Jan 6 03:31:24 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa16c48c3_2d9c2b276ec9e60c528652@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.3.57d11.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb08 failed "build libosmocore_1.3.0.3.57d11.dsc" at Mon Jan 6 03:31:22 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.505021] sysrq: SysRq : Power Off [ 22s] [ 7.513571] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb08 failed "build libosmocore_1.3.0.3.57d11.dsc" at Mon Jan 6 03:31:25 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:13 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa148ac43_2d9c2b276ec9e60c52823f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Testing/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb10 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 6 03:30:54 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.759465] sysrq: SysRq : Power Off [ 24s] [ 7.767906] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb10 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 6 03:30:57 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa171b8d0_2d9c2b276ec9e60c5287f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmocom-nightly_0.0.0.20200106.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-nightly_0.0.0.20200106.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] cloud106 failed "build osmocom-nightly_0.0.0.20200106.dsc" at Mon Jan 6 03:31:22 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.048171] sysrq: SysRq : Power Off [ 25s] [ 8.065869] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] cloud106 failed "build osmocom-nightly_0.0.0.20200106.dsc" at Mon Jan 6 03:31:25 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:31 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa1854629_2d9c2b276ec9e60c52906a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb27 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 03:31:24 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 8.384260] sysrq: SysRq : Power Off [ 23s] [ 8.393407] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb27 failed "build libsmpp34_1.14.0.dsc" at Mon Jan 6 03:31:28 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa33ba559_2d9c2b276ec9e60c5294d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb65 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 03:31:38 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.827026] sysrq: SysRq : Power Off [ 25s] [ 7.832796] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb65 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 03:31:41 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:nightly/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa53acbce_2d9c2b276ec9e60c530536@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/Debian_Testing/x86_64 Package network:osmocom:nightly/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb05 failed "build yder_1.4.4-4.1.dsc" at Mon Jan 6 03:32:09 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.610966] sysrq: SysRq : Power Off [ 22s] [ 7.618489] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb05 failed "build yder_1.4.4-4.1.dsc" at Mon Jan 6 03:32:12 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:31:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:31:48 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa3518e5b_2d9c2b276ec9e60c5296d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 27s] running base-passwd preinstall script [ 27s] running base-passwd postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running user-setup postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running base-files postinstall script [ 27s] running gawk postinstall script [ 27s] querying package ids... [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] installing [ 28s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] exit ... [ 28s] [ 28s] cloud108 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 03:31:30 UTC 2020. [ 28s] [ 28s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 28s] ### VM INTERACTION START ### [ 31s] [ 14.024422] sysrq: SysRq : Power Off [ 31s] [ 14.030049] reboot: Power down [ 31s] ### VM INTERACTION END ### [ 31s] [ 31s] cloud108 failed "build libgtpnl_1.2.1.dsc" at Mon Jan 6 03:31:34 UTC 2020. [ 31s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa544ba99_2d9c2b276ec9e60c530785@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 17s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb17 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 03:32:09 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 22s] [ 7.624712] sysrq: SysRq : Power Off [ 22s] [ 7.631657] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb17 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 03:32:13 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa52b06f0_2d9c2b276ec9e60c5302a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Testing/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] build70 failed "build simtrace2_0.5.2.dsc" at Mon Jan 6 03:32:05 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 22s] [ 7.993208] sysrq: SysRq : Power Off [ 22s] [ 7.995447] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] build70 failed "build simtrace2_0.5.2.dsc" at Mon Jan 6 03:32:10 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa557d6fc_2d9c2b276ec9e60c53117e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb69 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 03:32:17 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.585972] sysrq: SysRq : Power Off [ 22s] [ 7.593995] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb69 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 03:32:20 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa5525fee_2d9c2b276ec9e60c531070@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Testing/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb59 failed "build yder_1.4.4-4.1.dsc" at Mon Jan 6 03:32:12 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 26s] [ 8.776786] sysrq: SysRq : Power Off [ 26s] [ 8.789257] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb59 failed "build yder_1.4.4-4.1.dsc" at Mon Jan 6 03:32:17 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa54c5580_2d9c2b276ec9e60c530948@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb23 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 03:32:12 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.659132] sysrq: SysRq : Power Off [ 22s] [ 7.666429] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb23 failed "build libosmo-abis_0.8.0.dsc" at Mon Jan 6 03:32:15 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:22 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa55cdb9e_2d9c2b276ec9e60c5312da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] build30 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Mon Jan 6 03:32:18 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.473039] sysrq: SysRq : Power Off [ 23s] [ 7.490136] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] build30 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Mon Jan 6 03:32:21 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa702f23d_2d9c2b276ec9e60c5316af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-python-tests_0.0.9.20200106.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-python-tests_0.0.9.20200106.dsc build ... [ 17s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/208] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb20 failed "build osmo-python-tests_0.0.9.20200106.dsc" at Mon Jan 6 03:32:26 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 22s] [ 7.487744] sysrq: SysRq : Power Off [ 22s] [ 7.493782] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb20 failed "build osmo-python-tests_0.0.9.20200106.dsc" at Mon Jan 6 03:32:30 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa70cb500_2d9c2b276ec9e60c5318f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb52 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 03:32:27 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 23s] [ 7.574513] sysrq: SysRq : Power Off [ 23s] [ 7.587386] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb52 failed "build osmo-pcap_0.1.2.dsc" at Mon Jan 6 03:32:31 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa71c6e81_2d9c2b276ec9e60c53203b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] cloud122 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 03:32:18 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 29s] [ 8.345177] sysrq: SysRq : Power Off [ 29s] [ 8.350690] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] cloud122 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 03:32:22 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa725c673_2d9c2b276ec9e60c53219a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb03 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 03:32:50 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 27s] [ 8.019587] sysrq: SysRq : Power Off [ 27s] [ 8.025374] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb03 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 03:32:54 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa7337ac8_2d9c2b276ec9e60c532386@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 47s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 47s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 47s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 47s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 47s] running base-passwd preinstall script [ 47s] running base-passwd postinstall script [ 47s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 47s] running user-setup postinstall script [ 47s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 47s] running base-files postinstall script [ 47s] running gawk postinstall script [ 49s] querying package ids... [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] installing [ 49s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] exit ... [ 49s] [ 49s] cloud118 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Mon Jan 6 03:32:36 UTC 2020. [ 49s] [ 49s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 49s] ### VM INTERACTION START ### [ 53s] [ 14.510330] sysrq: SysRq : Power Off [ 53s] [ 14.548816] reboot: Power down [ 53s] ### VM INTERACTION END ### [ 53s] [ 53s] cloud118 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Mon Jan 6 03:32:41 UTC 2020. [ 53s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa72b30c3_2d9c2b276ec9e60c53223@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb52 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 03:32:35 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.782779] sysrq: SysRq : Power Off [ 26s] [ 7.802319] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb52 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 03:32:39 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:56 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa739efad_2d9c2b276ec9e60c532415@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 29s] running base-passwd preinstall script [ 29s] running base-passwd postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running user-setup postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running base-files postinstall script [ 29s] running gawk postinstall script [ 33s] querying package ids... [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] installing [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] exit ... [ 34s] [ 34s] cloud130 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Mon Jan 6 03:32:40 UTC 2020. [ 34s] [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] ### VM INTERACTION START ### [ 37s] [ 15.524108] sysrq: SysRq : Power Off [ 37s] [ 15.539306] reboot: Power down [ 37s] ### VM INTERACTION END ### [ 37s] [ 37s] cloud130 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Mon Jan 6 03:32:43 UTC 2020. [ 37s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:32:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:32:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa7451e97_2d9c2b276ec9e60c5325fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb57 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 03:32:47 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.931912] sysrq: SysRq : Power Off [ 25s] [ 7.939235] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb57 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 03:32:50 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:13 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa8dbde60_2d9c2b276ec9e60c532684@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb17 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 03:32:55 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.680565] sysrq: SysRq : Power Off [ 21s] [ 7.688576] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb17 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 03:32:59 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:13 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa8e49bba_2d9c2b276ec9e60c532821@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb08 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jan 6 03:32:57 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.630622] sysrq: SysRq : Power Off [ 22s] [ 7.639317] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb08 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jan 6 03:33:00 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:31 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa8f5447c_2d9c2b276ec9e60c533190@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] cloud122 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jan 6 03:33:13 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.174222] sysrq: SysRq : Power Off [ 26s] [ 8.179612] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] cloud122 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jan 6 03:33:16 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa8fab933_2d9c2b276ec9e60c533231@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 16s] querying package ids... [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] sheep82 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 03:33:14 UTC 2020. [ 17s] [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] ### VM INTERACTION START ### [ 20s] [ 8.117449] sysrq: SysRq : Power Off [ 20s] [ 8.127780] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] sheep82 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 03:33:17 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa90228fc_2d9c2b276ec9e60c5333c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb23 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 03:33:19 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.818068] sysrq: SysRq : Power Off [ 24s] [ 7.826122] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb23 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 03:33:22 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:31 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa906fbf5_2d9c2b276ec9e60c533414@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 28s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 28s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 28s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 28s] running base-passwd preinstall script [ 28s] running base-passwd postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running user-setup postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running base-files postinstall script [ 28s] running gawk postinstall script [ 29s] querying package ids... [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] installing [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] exit ... [ 29s] [ 29s] cloud108 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 03:33:19 UTC 2020. [ 29s] [ 29s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 29s] ### VM INTERACTION START ### [ 32s] [ 13.850843] sysrq: SysRq : Power Off [ 32s] [ 13.855185] reboot: Power down [ 32s] ### VM INTERACTION END ### [ 32s] [ 32s] cloud108 failed "build libosmo-netif_0.7.0.dsc" at Mon Jan 6 03:33:22 UTC 2020. [ 32s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aa915a7ad_2d9c2b276ec9e60c533674@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb51 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 03:33:25 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.905578] sysrq: SysRq : Power Off [ 26s] [ 7.912810] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb51 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 03:33:29 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aaab1f6ee_2d9c2b276ec9e60c533863@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 62s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 62s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 62s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 62s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 62s] running base-passwd preinstall script [ 62s] running base-passwd postinstall script [ 62s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 62s] running user-setup postinstall script [ 62s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 62s] running base-files postinstall script [ 62s] running gawk postinstall script [ 63s] querying package ids... [ 63s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] installing [ 63s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 64s] exit ... [ 64s] [ 64s] cloud129 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 03:33:30 UTC 2020. [ 64s] [ 64s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 64s] ### VM INTERACTION START ### [ 67s] [ 12.218855] sysrq: SysRq : Power Off [ 67s] [ 12.236706] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] cloud129 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 03:33:34 UTC 2020. [ 67s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:33:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:33:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aaac3f89d_2d9c2b276ec9e60c5341f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc ... [ 17s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb17 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Mon Jan 6 03:33:42 UTC 2020. [ 18s] [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.603025] sysrq: SysRq : Power Off [ 21s] [ 7.611735] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb17 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Mon Jan 6 03:33:45 UTC 2020. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aacb33978_2d9c2b276ec9e60c53435@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb09 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 03:33:46 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.960337] sysrq: SysRq : Power Off [ 25s] [ 7.966867] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb09 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 03:33:50 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aacb89d22_2d9c2b276ec9e60c5344c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb08 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 03:33:47 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.833046] sysrq: SysRq : Power Off [ 25s] [ 7.839754] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb08 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 03:33:50 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aacbe467a_2d9c2b276ec9e60c53459b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb03 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 03:33:47 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 7.939414] sysrq: SysRq : Power Off [ 27s] [ 7.945180] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb03 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 03:33:51 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aacd98f5b_2d9c2b276ec9e60c534874@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb62 failed "build osmo-sysmon_0.2.0.dsc" at Mon Jan 6 03:34:16 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.477737] sysrq: SysRq : Power Off [ 22s] [ 7.486370] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb62 failed "build osmo-sysmon_0.2.0.dsc" at Mon Jan 6 03:34:19 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aacd2cc7d_2d9c2b276ec9e60c5347bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/513] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb28 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 03:34:12 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.184192] sysrq: SysRq : Power Off [ 27s] [ 8.201856] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb28 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 03:34:15 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aae78899a_2d9c2b276ec9e60c5349c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb23 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 03:34:19 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.892694] sysrq: SysRq : Power Off [ 25s] [ 7.898831] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb23 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 03:34:22 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aae82b88a_2d9c2b276ec9e60c53508@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb26 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 03:34:22 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 28s] [ 8.206568] sysrq: SysRq : Power Off [ 28s] [ 8.213619] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] lamb26 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 03:34:26 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:39 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aae89d962_2d9c2b276ec9e60c53517b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/511] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 03:34:24 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.825895] sysrq: SysRq : Power Off [ 25s] [ 7.832413] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 03:34:27 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:56 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aae981714_2d9c2b276ec9e60c5352da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Testing/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/openbsc_1.3.2.20200106.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.20200106.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb04 failed "build openbsc_1.3.2.20200106.dsc" at Mon Jan 6 03:34:48 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.581900] sysrq: SysRq : Power Off [ 23s] [ 7.595046] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb04 failed "build openbsc_1.3.2.20200106.dsc" at Mon Jan 6 03:34:51 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aaea26c48_2d9c2b276ec9e60c53547a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb28 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 03:34:50 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.780925] sysrq: SysRq : Power Off [ 22s] [ 7.786551] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb28 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 03:34:53 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:34:56 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12aaea8d016_2d9c2b276ec9e60c535573@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb61 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 03:34:51 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.993501] sysrq: SysRq : Power Off [ 25s] [ 8.000803] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb61 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 03:34:54 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:35:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:35:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab051bd2f_2d9c2b276ec9e60c53571b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb55 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 03:35:00 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.033632] sysrq: SysRq : Power Off [ 26s] [ 8.040960] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb55 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 03:35:03 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:35:48 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab258f661_2d9c2b276ec9e60c5359b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Testing/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/openbsc_1.3.2.dsc ... [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 15s] querying package ids... [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] installing [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] exit ... [ 15s] [ 15s] sheep83 failed "build openbsc_1.3.2.dsc" at Mon Jan 6 03:35:33 UTC 2020. [ 15s] [ 15s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 15s] ### VM INTERACTION START ### [ 18s] [ 7.995102] sysrq: SysRq : Power Off [ 18s] [ 8.005993] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] sheep83 failed "build openbsc_1.3.2.dsc" at Mon Jan 6 03:35:37 UTC 2020. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:35:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab2691d1e_2d9c2b276ec9e60c5361d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 24s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] cloud105 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 03:35:44 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 28s] [ 7.649656] sysrq: SysRq : Power Off [ 28s] [ 7.654449] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] cloud105 failed "build osmo-iuh_0.6.0.dsc" at Mon Jan 6 03:35:47 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab3ff3db2_2d9c2b276ec9e60c5362bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 24s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] lamb26 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 03:35:47 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 29s] [ 8.402278] sysrq: SysRq : Power Off [ 29s] [ 8.415150] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] lamb26 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 03:35:51 UTC 2020. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab408e675_2d9c2b276ec9e60c5363d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb60 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 03:35:44 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.895102] sysrq: SysRq : Power Off [ 25s] [ 7.900555] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb60 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 03:35:48 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:36:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab40e5d89_2d9c2b276ec9e60c53646@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb17 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 03:35:45 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.971158] sysrq: SysRq : Power Off [ 25s] [ 7.976926] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb17 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 03:35:49 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:36:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:36:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab6187b0b_2d9c2b276ec9e60c536713@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb22 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 03:36:51 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.828246] sysrq: SysRq : Power Off [ 25s] [ 7.833689] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb22 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 03:36:54 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:37:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e12ab9aafe78_2d9c2b276ec9e60c53685e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 60s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] processing recipe /.build-srcdir/osmo-msc_1.6.0.dsc ... [ 60s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 60s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.dsc build ... [ 60s] running base-passwd preinstall script [ 60s] running base-passwd postinstall script [ 61s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 61s] running user-setup postinstall script [ 61s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 61s] running base-files postinstall script [ 61s] running gawk postinstall script [ 62s] querying package ids... [ 62s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 62s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 64s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 64s] installing [ 64s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 64s] exit ... [ 64s] [ 64s] lamb02 failed "build osmo-msc_1.6.0.dsc" at Mon Jan 6 03:37:32 UTC 2020. [ 64s] [ 64s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 64s] ### VM INTERACTION START ### [ 67s] [ 18.796619] sysrq: SysRq : Power Off [ 67s] [ 18.819437] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] lamb02 failed "build osmo-msc_1.6.0.dsc" at Mon Jan 6 03:37:35 UTC 2020. [ 67s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 03:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 03:43:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e12ad0226013_2d9c2b276ec9e60c53713a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 310s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 310s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 310s] dh_install -O--fail-missing [ 310s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 310s] dh_install: This feature will be removed in compat 12. [ 310s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 310s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 310s] dh_missing: missing files, aborting [ 310s] The following debhelper tools have reported what they installed (with files per package) [ 310s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 310s] If the missing files are installed by another tool, please file a bug against it. [ 310s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 310s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 310s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 310s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 310s] For a short-term work-around: Add the files to debian/not-installed [ 310s] dh_install: dh_missing --fail-missing returned exit code 255 [ 310s] make: *** [debian/rules:12: binary] Error 255 [ 310s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 310s] [ 310s] sheep82 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 03:43:22 UTC 2020. [ 310s] [ 310s] ### VM INTERACTION START ### [ 313s] [ 301.826824] sysrq: SysRq : Power Off [ 313s] [ 301.836802] reboot: Power down [ 313s] ### VM INTERACTION END ### [ 313s] [ 313s] sheep82 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 03:43:27 UTC 2020. [ 313s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:25:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:25:57 +0000 Subject: Change in docker-playground[master]: Add debian-buster-erlang container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16737 ) Change subject: Add debian-buster-erlang container ...................................................................... Add debian-buster-erlang container The idea for this is to be used in build verification for erlang projects. We also include C compiler and common utilities for those projects or upstream dependencies that may require it. Change-Id: I06c11a188404e183ed04bacf1673ecef2dc9ca47 --- A debian-buster-erlang/Dockerfile A debian-buster-erlang/Makefile A debian-buster-erlang/Release.key 3 files changed, 71 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile new file mode 100644 index 0000000..ed20b37 --- /dev/null +++ b/debian-buster-erlang/Dockerfile @@ -0,0 +1,50 @@ +FROM debian:buster + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/" + +# install the erlang vm and rebar (2) +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get -y install \ + erlang \ + rebar + +# add rebar3 +ADD https://s3.amazonaws.com/rebar3/rebar3 /usr/bin/rebar3 +RUN chmod 0755 /usr/bin/rebar3 + +# install ninimal build utilities as well as system utilities +RUN apt-get update && \ + apt-get -y install \ + build-essential \ + git \ + procps \ + tcpdump \ + vim \ + netcat-openbsd \ + wget \ + && \ + apt-get clean + +# install additional C-language / system dependencies of our Erlang projects +RUN apt-get update && \ + apt-get -y install \ + libpcap-dev \ + && \ + apt-get clean + +# add osmocom latest repo, should we ever require packages from there +RUN apt-get update && apt-get install -y \ + gnupg +COPY Release.key /tmp/Release.key +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release + +# add a non-root user under which we will normaly execute build tests +RUN useradd -m osmocom +WORKDIR /home/osmocom +USER osmocom diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-erlang/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/debian-buster-erlang/Release.key b/debian-buster-erlang/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-buster-erlang/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06c11a188404e183ed04bacf1673ecef2dc9ca47 Gerrit-Change-Number: 16737 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:34 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 10:26:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:42 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 10:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:46 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Pass paging group instead of imsi where later is not needed Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h M src/tbf.cpp M src/tbf_dl.cpp 9 files changed, 54 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index 71a2f06..5e1725c 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -890,7 +890,7 @@ return 0; } -void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi) +void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, uint16_t pgroup) { int plen; unsigned int ts = tbf->first_ts; @@ -910,7 +910,7 @@ GSM_L1_BURST_TYPE_ACCESS_0); if (plen >= 0) { immediate_assignment_dl_tbf(); - pcu_l1if_tx_pch(immediate_assignment, plen, imsi); + pcu_l1if_tx_pch(immediate_assignment, plen, pgroup); } bitvec_free(immediate_assignment); diff --git a/src/bts.h b/src/bts.h index 0eaab85..823138b 100644 --- a/src/bts.h +++ b/src/bts.h @@ -306,7 +306,7 @@ enum ph_burst_type burst_type); int rcv_ptcch_rach(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta); - void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi); + void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, uint16_t pgroup); GprsMsStorage &ms_store(); GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0); diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 6435d99..54927f5 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -174,6 +174,7 @@ static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { char imsi[16]; + uint16_t pgroup; uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); uint16_t ptmsi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); int rc; @@ -195,10 +196,15 @@ TLVP_LEN(tp, BSSGP_IE_IMSI)); if (rc != GSM23003_IMSI_MAX_DIGITS + 1) { LOGP(DBSSGP, LOGL_NOTICE, "Failed to parse IMSI IE (rc=%d)\n", rc); - return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + pgroup = imsi2paging_group(imsi); + if (pgroup > 999) { + LOGP(DBSSGP, LOGL_NOTICE, "Failed to compute IMSI %s paging group\n", imsi); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } - return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, imsi); + return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, pgroup); } /* Receive a BSSGP PDU from a BSS on a PTP BVCI */ diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index e381b11..cbfc87f 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -29,13 +29,13 @@ extern void *tall_pcu_ctx; int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi) + uint16_t pgroup) { LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n"); bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); bitvec_unhex(paging_request, DUMMY_VEC); int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len); - pcu_l1if_tx_pch(paging_request, plen, (char *)imsi); + pcu_l1if_tx_pch(paging_request, plen, pgroup); bitvec_free(paging_request); return 0; diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 5361a1c..6f3418c 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -26,6 +26,7 @@ #ifdef __cplusplus #include #include +#include extern "C" { #include @@ -92,8 +93,7 @@ int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf); -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi); +int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, uint16_t pgroup); struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index bac0e56..1f23c25 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -60,6 +60,28 @@ extern void *tall_pcu_ctx; +#define PAGING_GROUP_LEN 3 + +/* returns [0,999] on success, > 999 on error */ +uint16_t imsi2paging_group(const char* imsi) +{ + uint16_t pgroup = 0; + size_t len = strlen(imsi); + + if (!imsi || len < PAGING_GROUP_LEN) + return 0xFFFF; + imsi += len - PAGING_GROUP_LEN; + + while (*imsi != '\0') { + if (!isdigit(*imsi)) + return 0xFFFF; + pgroup *= 10; + pgroup += *imsi - '0'; + imsi++; + } + return pgroup; +} + /* * PCU messages */ @@ -218,19 +240,18 @@ pcu_tx_data_req(0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, GSM_MACBLOCK_LEN); } -#define PAGING_GROUP_LEN 3 -void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi) +void pcu_l1if_tx_pch(bitvec * block, int plen, uint16_t pgroup) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t data[PAGING_GROUP_LEN + GSM_MACBLOCK_LEN]; + int i; /* prepend paging group */ - if (!imsi || strlen(imsi) < PAGING_GROUP_LEN) - return; - imsi += strlen(imsi) - PAGING_GROUP_LEN; - data[0] = imsi[0]; - data[1] = imsi[1]; - data[2] = imsi[2]; + for (i = 0; i < PAGING_GROUP_LEN; i++) { + data[PAGING_GROUP_LEN - 1 - i] = '0' + (char)(pgroup % 10); + pgroup = pgroup / 10; + } + OSMO_ASSERT(pgroup == 0); /* block provided by upper layer comes without first byte (plen), * prepend it manually: diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index a77a6c8..35643da 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -159,7 +159,7 @@ uint8_t *data, size_t data_len); void pcu_l1if_tx_agch(bitvec * block, int len); -void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi); +void pcu_l1if_tx_pch(bitvec * block, int plen, uint16_t pgroup); int pcu_tx_txt_ind(enum gsm_pcu_if_text_type t, const char *fmt, ...); @@ -184,7 +184,7 @@ void pcu_rx_block_time(uint16_t arfcn, uint32_t fn, uint8_t ts_no); void pcu_rx_ra_time(uint16_t arfcn, uint32_t fn, uint8_t ts_no); - +uint16_t imsi2paging_group(const char* imsi); #ifdef __cplusplus } #endif diff --git a/src/tbf.cpp b/src/tbf.cpp index 389b186..61d8d58 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -803,6 +803,7 @@ void gprs_rlcmac_tbf::poll_timeout() { + uint16_t pgroup; gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(this); LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN %d)\n", @@ -902,7 +903,9 @@ LOGPTBF(dl_tbf, LOGL_DEBUG, "Re-send dowlink assignment on PCH (IMSI=%s)\n", imsi()); /* send immediate assignment */ - dl_tbf->bts->snd_dl_ass(dl_tbf, false, imsi()); + if ((pgroup = imsi2paging_group(imsi())) > 999) + LOGPTBF(dl_tbf, LOGL_ERROR, "IMSI to paging group failed! (%s)\n", imsi()); + dl_tbf->bts->snd_dl_ass(dl_tbf, false, pgroup); dl_tbf->m_wait_confirm = 1; } } else diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index e3c1ff4..7113d65 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -507,6 +507,7 @@ /* depending on the current TBF, we assign on PACCH or AGCH */ void gprs_rlcmac_dl_tbf::trigger_ass(struct gprs_rlcmac_tbf *old_tbf) { + uint16_t pgroup; /* stop pending timer */ stop_timers("assignment (DL-TBF)"); @@ -530,7 +531,9 @@ TBF_SET_ASS_ON(this, GPRS_RLCMAC_FLAG_CCCH, false); /* send immediate assignment */ - bts->snd_dl_ass(this, false, imsi()); + if ((pgroup = imsi2paging_group(imsi())) > 999) + LOGPTBFDL(this, LOGL_ERROR, "IMSI to paging group failed! (%s)\n", imsi()); + bts->snd_dl_ass(this, false, pgroup); m_wait_confirm = 1; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:46 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Allow Gb PAGING-PS without P-TMSI P-TMSI is optional IE, but IE is mandatory and hence always available. Since the encoding is actually a Mobile Identity, the IMSI is used in case P-TMSI is not available. Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 --- M src/encoding.cpp M src/encoding.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 5 files changed, 27 insertions(+), 27 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/encoding.cpp b/src/encoding.cpp index d4a7ae0..8c3aaed 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -729,7 +729,7 @@ } /* Generate paging request. See 44.018, sections 10 and 9.1.22 */ -int Encoding::write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len) +int Encoding::write_paging_request(bitvec * dest, const uint8_t *mi, uint8_t mi_len) { unsigned wp = 0; int plen; @@ -741,14 +741,9 @@ bitvec_write_field(dest, &wp,0x0,4); // Page Mode bitvec_write_field(dest, &wp,0x0,4); // Channel Needed - // Mobile Identity - bitvec_write_field(dest, &wp,ptmsi_len+1,8); // Mobile Identity length - bitvec_write_field(dest, &wp,0xf,4); // unused - bitvec_write_field(dest, &wp,0x4,4); // PTMSI type - for (int i = 0; i < ptmsi_len; i++) - { - bitvec_write_field(dest, &wp,ptmsi[i],8); // PTMSI - } + bitvec_write_field(dest, &wp, mi_len, 8); // Mobile Identity length + bitvec_set_bytes(dest, mi, mi_len); // Mobile Identity + wp += mi_len * 8; if ((wp % 8)) log_alert_exit("Length of PAG.REQ without rest octets is not " diff --git a/src/encoding.h b/src/encoding.h index 6dcced0..31f74d1 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -77,7 +77,7 @@ bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final, uint8_t rrbp); - static int write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len); + static int write_paging_request(bitvec * dest, const uint8_t *mi, uint8_t mi_len); static unsigned write_repeated_page_info(bitvec * dest, unsigned& wp, uint8_t len, uint8_t *identity, uint8_t chan_needed); diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 54927f5..33b2ded 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -175,25 +175,18 @@ { char imsi[16]; uint16_t pgroup; - uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); - uint16_t ptmsi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); + const uint8_t *mi; + uint8_t mi_len; int rc; - LOGP(DBSSGP, LOGL_NOTICE, " P-TMSI = "); - for (int i = 0; i < ptmsi_len; i++) - { - LOGPC(DBSSGP, LOGL_NOTICE, "%02x", ptmsi[i]); - } - LOGPC(DBSSGP, LOGL_NOTICE, "\n"); - if (!TLVP_PRESENT(tp, BSSGP_IE_IMSI)) { LOGP(DBSSGP, LOGL_ERROR, "No IMSI\n"); - return -EINVAL; + return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg); } /* gsm48_mi_to_string() returns number of bytes written, including '\0' */ rc = gsm48_mi_to_string(imsi, sizeof(imsi), TLVP_VAL(tp, BSSGP_IE_IMSI), - TLVP_LEN(tp, BSSGP_IE_IMSI)); + TLVP_LEN(tp, BSSGP_IE_IMSI)); if (rc != GSM23003_IMSI_MAX_DIGITS + 1) { LOGP(DBSSGP, LOGL_NOTICE, "Failed to parse IMSI IE (rc=%d)\n", rc); return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); @@ -204,7 +197,15 @@ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } - return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, pgroup); + if (TLVP_PRESENT(tp, BSSGP_IE_TMSI)) { + mi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); + mi = TLVP_VAL(tp, BSSGP_IE_TMSI); + } else { /* Use IMSI if TMSI not available: */ + mi_len = TLVP_LEN(tp, BSSGP_IE_IMSI); + mi = TLVP_VAL(tp, BSSGP_IE_IMSI); + } + + return gprs_rlcmac_paging_request(mi, mi_len, pgroup); } /* Receive a BSSGP PDU from a BSS on a PTP BVCI */ diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index cbfc87f..c890021 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -19,6 +19,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +extern "C" { + #include +} + #include #include #include @@ -28,13 +32,13 @@ extern void *tall_pcu_ctx; -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - uint16_t pgroup) +int gprs_rlcmac_paging_request(const uint8_t *mi, uint8_t mi_len, uint16_t pgroup) { - LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n"); + LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH) MI=%s\n", + osmo_mi_name(mi, mi_len)); bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); bitvec_unhex(paging_request, DUMMY_VEC); - int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len); + int plen = Encoding::write_paging_request(paging_request, mi, mi_len); pcu_l1if_tx_pch(paging_request, plen, pgroup); bitvec_free(paging_request); diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 6f3418c..6d87107 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -93,7 +93,7 @@ int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf); -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, uint16_t pgroup); +int gprs_rlcmac_paging_request(const uint8_t *mi, uint8_t mi_len, uint16_t pgroup); struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:46 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Support Gb PAGING-CS The paging is sent over PACCH towards MS with an active TBF. Related: OS#2406 Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f --- M src/gprs_bssgp_pcu.cpp 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 33b2ded..955b8cd 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -171,6 +171,26 @@ ms_class, egprs_ms_class, delay_csec, data, len); } +static int gprs_bssgp_pcu_rx_paging_cs(struct msgb *msg, struct tlv_parsed *tp) +{ + const uint8_t *mi; + uint8_t mi_len; + uint8_t *chan_needed = (uint8_t *)TLVP_VAL(tp, BSSGP_IE_CHAN_NEEDED); + + if (TLVP_PRESENT(tp, BSSGP_IE_TMSI)) { + mi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); + mi = TLVP_VAL(tp, BSSGP_IE_TMSI); + } else if (TLVP_PRESENT(tp, BSSGP_IE_IMSI)) { /* Use IMSI if TMSI not available: */ + mi_len = TLVP_LEN(tp, BSSGP_IE_IMSI); + mi = TLVP_VAL(tp, BSSGP_IE_IMSI); + } else { + LOGP(DBSSGP, LOGL_ERROR, "Neither TMSI IE nor IMSI IE is present\n"); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + + return BTS::main_bts()->add_paging(chan_needed ? *chan_needed : 0, mi, mi_len); +} + static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { char imsi[16]; @@ -308,6 +328,9 @@ the_pcu.bvc_reset = 1; bvc_timeout(NULL); break; + case BSSGP_PDUT_PAGING_CS: + gprs_bssgp_pcu_rx_paging_cs(msg, tp); + break; case BSSGP_PDUT_PAGING_PS: gprs_bssgp_pcu_rx_paging_ps(msg, tp); break; @@ -320,7 +343,6 @@ break; case BSSGP_PDUT_SUSPEND_NACK: case BSSGP_PDUT_RESUME_NACK: - case BSSGP_PDUT_PAGING_CS: case BSSGP_PDUT_FLUSH_LL: case BSSGP_PDUT_SGSN_INVOKE_TRACE: LOGP(DBSSGP, LOGL_INFO, "Rx BSSGP BVCI=%d (SIGN) PDU type %s not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:26:47 +0000 Subject: Change in osmo-pcu[master]: Support PAGING-CS and PAGING-PS on on PTP-BVCI In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16538 ) Change subject: Support PAGING-CS and PAGING-PS on on PTP-BVCI ...................................................................... Support PAGING-CS and PAGING-PS on on PTP-BVCI Related: OS#2403 Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 955b8cd..f00fc94 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -265,8 +265,12 @@ LOGP(DBSSGP, LOGL_DEBUG, "Rx BSSGP BVCI=%d (PTP) %s\n", bvci, bssgp_pdu_str(pdu_type)); break; - case BSSGP_PDUT_PAGING_PS: case BSSGP_PDUT_PAGING_CS: + gprs_bssgp_pcu_rx_paging_cs(msg, tp); + break; + case BSSGP_PDUT_PAGING_PS: + gprs_bssgp_pcu_rx_paging_ps(msg, tp); + break; case BSSGP_PDUT_RA_CAPABILITY: case BSSGP_PDUT_RA_CAPA_UPDATE_ACK: LOGP(DBSSGP, LOGL_INFO, "Rx BSSGP BVCI=%d (PTP) PDU type %s not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 Gerrit-Change-Number: 16538 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:28:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:28:03 +0000 Subject: Change in osmo-bsc[master]: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14176 ) Change subject: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d Gerrit-Change-Number: 14176 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 10:28:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:28:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:28:17 +0000 Subject: Change in osmo-bsc[master]: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14176 ) Change subject: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal ...................................................................... Patch Set 2: patch exists since may, nobody wants to review it :( Merging it now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d Gerrit-Change-Number: 14176 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 10:28:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 10:28:18 +0000 Subject: Change in osmo-bsc[master]: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14176 ) Change subject: Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal ...................................................................... Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal Let's not just pass around the raw msgb, but also all other metadata, such as the decoded parts of the TS 12.21 message. As there's no current consumer of that signal, this creates no compatibility issues. Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 33 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 62a3d2c..10200d7 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -149,6 +149,20 @@ uint8_t mt; }; +struct nm_fail_rep_signal_data { + struct gsm_bts *bts; + /* raw data */ + struct msgb *msg; + struct tlv_parsed *tp; + /* parsed data */ + struct { + const char *event_type; + const char *severity; + const char *additional_text; + const uint8_t *probable_cause; + } parsed; +}; + struct challoc_signal_data { struct gsm_bts *bts; struct gsm_lchan *lchan; diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 7ca4e79..a874b53 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -358,6 +358,7 @@ struct abis_om_hdr *oh = msgb_l2(mb); struct abis_om_fom_hdr *foh = msgb_l3(mb); struct e1inp_sign_link *sign_link = mb->dst; + struct nm_fail_rep_signal_data sd; struct tlv_parsed tp; int rc = 0; const uint8_t *p_val = NULL; @@ -398,6 +399,24 @@ rc = -EINVAL; } + sd.bts = mb->trx->bts; + sd.msg = mb; + sd.tp = &tp; + if (e_type) + sd.parsed.event_type = e_type; + else + sd.parsed.event_type = ""; + if (severity) + sd.parsed.severity = severity; + else + sd.parsed.severity = ""; + if (p_text) + sd.parsed.additional_text = p_text; + else + sd.parsed.additional_text = ""; + sd.parsed.probable_cause = p_val; + osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, &sd); + if (p_text) talloc_free(p_text); @@ -419,7 +438,6 @@ break; case NM_MT_FAILURE_EVENT_REP: rx_fail_evt_rep(mb, bts); - osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, mb); break; case NM_MT_TEST_REP: DEBUGPFOH(DNM, foh, "Test Report\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d Gerrit-Change-Number: 14176 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 10:32:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jan 2020 10:32:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... BTS_Tests: tolerate empty measurement result on chan est. On channel establishment the first measurement result may lack the measurement reports from the MS. This is normal behavior, so lets tolerate that. Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Related: OS#2975 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 85 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 4ba8f55..3683306 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1730,18 +1730,86 @@ ?, t_toffs); } +/* build a template for matching measurement results that do not contain any + * MS related measurement (l1_info, l3_info and ms timing offset). */ +private function f_build_meas_res_tmpl_empty() runs on ConnHdlr return template RSL_Message { + var ConnL1Pars l1p := g_pars.l1_pars; + var template RSL_IE_UplinkMeas ul_meas := { + len := 3, + rfu := '0'B, + dtx_d := l1p.dtx_enabled, + rxlev_f_u := ?, + reserved1 := '00'B, + rxlev_s_u := ?, + reserved2 := '00'B, + rxq_f_u := ?, + rxq_s_u := ?, + supp_meas_info := omit + }; + if (l1p.toa256_enabled) { + ul_meas.len := (3+8); + ul_meas.supp_meas_info := { + toa256_mean := f_tolerance(l1p.timing_offset_256syms, -63*256, 192*256, mp_tolerance_timing_offset_256syms), + toa256_min := ?, + toa256_max := ?, + toa256_std_dev := ? + } + } + var template RSL_IE_BS_Power bs_power := { + reserved := 0, + epc := false, + fpc := false, + power_level := l1p.bs_power_level + }; + + return tr_RSL_MEAS_RES_EMPTY(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power); +} + /* verify we regularly receive measurement reports with incrementing numbers */ altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; + var boolean chan_est := false; + [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; } + + /* Receive osmocom specific measurement reports. This is the normal + * case. Here we verify that the measurement reports we sent are + * comming back as we expect them. */ [] RSL.receive(f_build_meas_res_tmpl()) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; /* Re-start the timer expecting the next MEAS RES */ f_timer_safe_restart(g_Tmeas_exp); + + /* The following two cases may only happen in the beginning + * of the channel establishment phase. Once we have received + * the "our" measurement report the first time, the channel + * is established and empty or hardcoded TRXCON reports must + * not occur anymore. */ + chan_est := true; + + repeat; + } + + /* When the BTS has established the channel, the MS might need slightly + * more time to establish the channel and actually start sending. The + * result is then a measurement report that just lacks the measurement + * information of the MS. This is normal and we tolerate this behavior. */ + [chan_est == false] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { + /* increment counter of next to-be-expected meas rep */ + g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; + /* Re-start the timer expecting the next MEAS RES */ + f_timer_safe_restart(g_Tmeas_exp); repeat; } - [] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_next_meas_res_nr)) -> value rsl { + + /* Due to the TDMA nature of GSM, TRXCON implements a way to emit dummy + * measurements if the TTCN3 side does not supply measurement input in + * time. In those cases TRXCON will either use a cached measurement + * report or a hardcoded one. If TRXCON picks the hardcoded measurement + * report the templates above will not match. We tolerate this + * behavior, but only once. */ + [chan_est == false] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_next_meas_res_nr)) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; if (g_first_meas_res) { diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index d982e02..f905973 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1363,6 +1363,22 @@ } } + /* Receive template for a measurement report that lacks the measurement report + * from the MS (l1_info, l3_info and ms timing offset */ + template RSL_Message tr_RSL_MEAS_RES_EMPTY(template RslChannelNr chan_nr, + template uint8_t meas_res_nr := ?, + template RSL_IE_UplinkMeas ul_meas := ?, + template RSL_IE_BS_Power bs_power := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_MEAS_RES, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{meas_res_nr := meas_res_nr}), + tr_RSL_IE(RSL_IE_Body:{uplink_meas := ul_meas}), + tr_RSL_IE(RSL_IE_Body:{bs_power := bs_power}) + } + } + /* Osmocom specific template, require lots of optional fields to be present */ template RSL_Message tr_RSL_MEAS_RES_OSMO(template RslChannelNr chan_nr, template uint8_t meas_res_nr := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 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: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 11:12:32 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jan 2020 11:12:32 +0000 Subject: Change in osmo-bts[master]: measurement: use signed integer for division of ta256b_sum References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16739 ) Change subject: measurement: use signed integer for division of ta256b_sum ...................................................................... measurement: use signed integer for division of ta256b_sum The variable ta256b_sum is int32_t and num_ul_meas_actual is unsigned int. When ta256b_sum is negative the division produces the wrong result. This is beacuse the division is performed unsigned as the usual arithmetic conversions promote to unsigned where both both operands are the same width. Lets fix this by casting num_ul_meas_actual to signed. (Note that in the same function there are various other averages computed in the same pattern, but they have unsigned operands and so are correct.) Related: SYS#4728 Change-Id: I37e3f69109c5ca2948bd4cdb7aa017bf2fcb8172 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/16739/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 12fd779..3e0daf1 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -662,7 +662,7 @@ if (!num_ul_meas_actual) ta256b_sum = lchan->meas.ms_toa256; else - ta256b_sum = ta256b_sum / num_ul_meas_actual; + ta256b_sum = ta256b_sum / (signed)num_ul_meas_actual; if (!num_meas_sub) ber_sub_sum = MEASUREMENT_DUMMY_BER; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I37e3f69109c5ca2948bd4cdb7aa017bf2fcb8172 Gerrit-Change-Number: 16739 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 11:29:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 11:29:00 +0000 Subject: Change in osmo-bts[master]: measurement: use signed integer for division of ta256b_sum In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16739 ) Change subject: measurement: use signed integer for division of ta256b_sum ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I37e3f69109c5ca2948bd4cdb7aa017bf2fcb8172 Gerrit-Change-Number: 16739 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 11:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 11:29:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 11:29:03 +0000 Subject: Change in osmo-bts[master]: measurement: use signed integer for division of ta256b_sum In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16739 ) Change subject: measurement: use signed integer for division of ta256b_sum ...................................................................... measurement: use signed integer for division of ta256b_sum The variable ta256b_sum is int32_t and num_ul_meas_actual is unsigned int. When ta256b_sum is negative the division produces the wrong result. This is beacuse the division is performed unsigned as the usual arithmetic conversions promote to unsigned where both both operands are the same width. Lets fix this by casting num_ul_meas_actual to signed. (Note that in the same function there are various other averages computed in the same pattern, but they have unsigned operands and so are correct.) Related: SYS#4728 Change-Id: I37e3f69109c5ca2948bd4cdb7aa017bf2fcb8172 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 12fd779..3e0daf1 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -662,7 +662,7 @@ if (!num_ul_meas_actual) ta256b_sum = lchan->meas.ms_toa256; else - ta256b_sum = ta256b_sum / num_ul_meas_actual; + ta256b_sum = ta256b_sum / (signed)num_ul_meas_actual; if (!num_meas_sub) ber_sub_sum = MEASUREMENT_DUMMY_BER; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I37e3f69109c5ca2948bd4cdb7aa017bf2fcb8172 Gerrit-Change-Number: 16739 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 15:45:35 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 6 Jan 2020 15:45:35 +0000 Subject: Change in osmo-gsm-manuals[master]: bts: Document access control classes and acc ramping References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 ) Change subject: bts: Document access control classes and acc ramping ...................................................................... bts: Document access control classes and acc ramping Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Related: OS#2722 --- M common/chapters/bts.adoc 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/16740/1 diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 6228310..2a8c83a 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -399,3 +399,50 @@ timeslot 7 phys_chan_config PDCH ---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Gerrit-Change-Number: 16740 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 16:13:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jan 2020 16:13:18 +0000 Subject: Change in osmo-gsm-manuals[master]: bts: Document access control classes and acc ramping In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 ) Change subject: bts: Document access control classes and acc ramping ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Gerrit-Change-Number: 16740 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 06 Jan 2020 16:13:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 16:39:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 16:39:51 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add initial code for checking ICE40-E1 traces References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16741 ) Change subject: e1-prbs-test: Add initial code for checking ICE40-E1 traces ...................................................................... e1-prbs-test: Add initial code for checking ICE40-E1 traces The idea of this code is to check captures made by ICE40 against the known transmitted per-timeslots PRBS sequences. Change-Id: I084a9737c9e051dcadf971e39e32f10f89aecfbd --- M contrib/e1-prbs-test/Makefile A contrib/e1-prbs-test/ice40-rx.c M contrib/e1-prbs-test/internal.h 3 files changed, 239 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/41/16741/1 diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile index 726befc..172847f 100644 --- a/contrib/e1-prbs-test/Makefile +++ b/contrib/e1-prbs-test/Makefile @@ -4,13 +4,16 @@ CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) LIBS=$(LIBOSMO_LIBS) -all: e1-prbs-test +all: e1-prbs-test ice40-e1-prbs-check e1-prbs-test: main.o rx.o tx.o prbs.o utils.o $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +ice40-e1-prbs-check: ice40-rx.o rx.o prbs.o utils.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ clean: - @rm -f e1-prbs-test e1-prbs-test *.o + @rm -f e1-prbs-test ice40-e1-prbs-check *.o diff --git a/contrib/e1-prbs-test/ice40-rx.c b/contrib/e1-prbs-test/ice40-rx.c new file mode 100644 index 0000000..de0e4f1 --- /dev/null +++ b/contrib/e1-prbs-test/ice40-rx.c @@ -0,0 +1,233 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "internal.h" + +static struct test_state g_tst; +static int g_prbs_offs_rx; +static uint8_t g_usb_endpoint = 0x81; + +#define E1_CHUNK_HDR_MAGIC 0xe115600d /* E1 is good */ +struct e1_chunk_hdr { + uint32_t magic; + struct { + uint64_t sec; + uint64_t usec; + } time; + uint16_t len; /* length of following payload */ + uint8_t ep; /* USB endpoint */ +} __attribute__((packed)); + +struct ts_buf { + uint8_t bytes[1024]; +}; +struct line_ts_buf { + struct ts_buf ts_buf[32]; + unsigned int next_offset; +}; +static struct line_ts_buf g_line_ts_buf; + +static int demux_in(struct test_state *tst, const uint8_t *data, size_t len) +{ + int i; + + if (len % 32) + fprintf(stderr, "Length %zu is not multiple of 32\n", len); + + for (i = 0; i < len; i++) { + uint32_t ts_nr = i % 32; + g_line_ts_buf.ts_buf[ts_nr].bytes[g_line_ts_buf.next_offset] = data[i]; + + /* go to next offset in all per-timeslot buffers */ + if (ts_nr == 31) + g_line_ts_buf.next_offset++; + + /* if per-ts buffers are full, hand them to decoder */ + if (g_line_ts_buf.next_offset >= sizeof(g_line_ts_buf.ts_buf[0].bytes)) { + uint8_t j; + for (j = 0; j < 32; j++) { + struct timeslot_state *ts = &tst->ts[j]; + //printf("process_rx(%u, %s)\n", j, osmo_hexdump(g_line_ts_buf.ts_buf[j].bytes, g_line_ts_buf.next_offset)); + process_rx(&ts->rx, j, g_line_ts_buf.ts_buf[j].bytes, g_line_ts_buf.next_offset); + } + memset(&g_line_ts_buf, 0, sizeof(g_line_ts_buf)); + g_line_ts_buf.next_offset = 0; + } + } + return 0; +} + + +static int process_file(struct test_state *tst, int fd) +{ + struct e1_chunk_hdr hdr; + unsigned long offset = 0; + uint8_t buf[65535]; + int rc; + + while (1) { + /* first read header */ + rc = read(fd, &hdr, sizeof(hdr)); + if (rc < 0) + return rc; + if (rc != sizeof(hdr)) { + fprintf(stderr, "%d is less than header size (%zd)\n", rc, sizeof(hdr)); + return -1; + } + offset += rc; + if (hdr.magic != E1_CHUNK_HDR_MAGIC) { + fprintf(stderr, "offset %lu: Wrong magic 0x%08x\n", offset, hdr.magic); + return -1; + } + + /* then read payload */ + rc = read(fd, buf, hdr.len); + if (rc < 0) + return rc; + offset += rc; + if (rc != hdr.len) { + fprintf(stderr, "%d is less than payload size (%d)\n", rc, hdr.len); + return -1; + } + + /* filter on the endpoint (direction) specified by the user */ + if (hdr.ep != g_usb_endpoint) + continue; + + if (hdr.len <= 4) + continue; + + //printf("> %s\n", osmo_hexdump(buf, hdr.len)); + demux_in(tst, buf+4, hdr.len-4); + } +} + +static int open_file(struct test_state *tst, const char *fname) +{ + int i; + for (i = 0; i < 32; i++) { + struct timeslot_state *ts = &tst->ts[i]; + ts->ofd.priv_nr = i; + ts_init_prbs_rx(ts, g_prbs_offs_rx); + } + + return open(fname, O_RDONLY); +} + +static void print_report(void) +{ + struct timespec ts_now; + int i; + + clock_gettime(CLOCK_MONOTONIC, &ts_now); + + for (i = 0; i < ARRAY_SIZE(g_tst.ts); i++) { + const struct timeslot_state *ts = &g_tst.ts[i]; + printf("E1TS(%02u) STATS: sync_losses=%u, bit_errs=%u in %lu seconds\n", + ts->ofd.priv_nr, ts->rx.sync_state.num_sync_loss, ts->rx.sync_state.num_bit_err, + ts_now.tv_sec - ts->rx.sync_state.ts_sync.tv_sec); + } +} + +static void sig_handler(int signal) +{ + switch (signal) { + case SIGINT: + print_report(); + exit(0); + break; + case SIGHUP: + print_report(); + break; + } +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int c; + static const struct option long_opts[] = { + { "rx-prbs-offset", 1, 0, 'r' }, + { "endpoint", 1, 0, 'e' }, + { 0, 0, 0, 0 } + }; + c = getopt_long(argc, argv, "r:e:", long_opts, NULL); + if (c == -1) + break; + + switch (c) { + case 'r': + g_prbs_offs_rx = atoi(optarg); + break; + case 'e': + g_usb_endpoint = strtoul(optarg, NULL, 16); + break; + default: + exit(1); + } + } +} + +int main(int argc, char **argv) +{ + char *fname; + int rc; + + handle_options(argc, argv); + + if (argc <= optind) { + fprintf(stderr, "You must specify the file name of the ICE40-E1 capture\n"); + exit(1); + } + fname = argv[optind]; + + signal(SIGINT, sig_handler); + signal(SIGHUP, sig_handler); + + rc = open_file(&g_tst, fname); + if (rc < 0) { + fprintf(stderr, "Error opening %s: %s\n", fname, strerror(errno)); + exit(1); + } + process_file(&g_tst, rc); + print_report(); +} diff --git a/contrib/e1-prbs-test/internal.h b/contrib/e1-prbs-test/internal.h index 681648a..a2c4ef5 100644 --- a/contrib/e1-prbs-test/internal.h +++ b/contrib/e1-prbs-test/internal.h @@ -4,7 +4,7 @@ #include #include -#define MAX_NR_TS 31 +#define MAX_NR_TS 32 #define PRBS_LEN 2048 /* prbs.c */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I084a9737c9e051dcadf971e39e32f10f89aecfbd Gerrit-Change-Number: 16741 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 16:40:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 16:40:08 +0000 Subject: Change in osmo-e1d[master]: contrib: add e1-prbs-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16735 ) Change subject: contrib: add e1-prbs-test ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 Gerrit-Change-Number: 16735 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Jan 2020 16:40:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 16:41:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 16:41:03 +0000 Subject: Change in osmo-gsm-manuals[master]: bts: Document access control classes and acc ramping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 ) Change subject: bts: Document access control classes and acc ramping ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Gerrit-Change-Number: 16740 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 16:41:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 16:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 16:41:05 +0000 Subject: Change in osmo-gsm-manuals[master]: bts: Document access control classes and acc ramping In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 ) Change subject: bts: Document access control classes and acc ramping ...................................................................... bts: Document access control classes and acc ramping Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Related: OS#2722 --- M common/chapters/bts.adoc 1 file changed, 47 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 6228310..2a8c83a 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -399,3 +399,50 @@ timeslot 7 phys_chan_config PDCH ---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia6fbd2da0d03dd372f3d1a34fbed8ac6fc7ed08c Gerrit-Change-Number: 16740 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:02:08 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:02:08 +0000 Subject: Change in osmo-msc[master]: vlr_gsup_rx: fix uninitialized rc References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16742 ) Change subject: vlr_gsup_rx: fix uninitialized rc ...................................................................... vlr_gsup_rx: fix uninitialized rc Change-Id: Id7776a473b8356d1d136d78736698f20accc7a36 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/16742/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 1a753dc..f644df8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1069,7 +1069,7 @@ { struct vlr_instance *vlr = data; struct vlr_subscr *vsub; - int rc; + int rc = 0; vsub = vlr_subscr_find_by_imsi(vlr, gsup->imsi, __func__); if (!vsub) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id7776a473b8356d1d136d78736698f20accc7a36 Gerrit-Change-Number: 16742 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:02:08 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:02:08 +0000 Subject: Change in osmo-msc[master]: vlr.c: fix condition to check MSISDN presence References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16743 ) Change subject: vlr.c: fix condition to check MSISDN presence ...................................................................... vlr.c: fix condition to check MSISDN presence msisdn_enc is a buffer, its address is always != 0 Change-Id: Ib2294d2cd339c36df599d7d134f979a572ac308a --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/16743/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f644df8..b164fd8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -784,7 +784,7 @@ unsigned idx; int rc; - if (gsup_msg->msisdn_enc) {//FIXME: vlr_subscr_set_msisdn()? + if (gsup_msg->msisdn_enc_len) {//FIXME: vlr_subscr_set_msisdn()? gsm48_decode_bcd_number2(vsub->msisdn, sizeof(vsub->msisdn), gsup_msg->msisdn_enc, gsup_msg->msisdn_enc_len, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib2294d2cd339c36df599d7d134f979a572ac308a Gerrit-Change-Number: 16743 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:06:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:06:39 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... fix nullpointer: in gsm48_rx_gmm_ra_upd_req() This caused frequent crashes at 36c3. The "proper" fix is probably elsewhere (lynxis mentions an unfinished patch), but at least this prevented some crashes during active operation. Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc --- M src/sgsn/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/16744/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index f62d0d1..d340005 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1642,7 +1642,7 @@ rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); /* Update the MM context with the new RA-ID */ - if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { + if (mmctx->ran_type == MM_CTX_T_GERAN_Gb && msgb_bcid(msg)) { bssgp_parse_cell_id(&mmctx->ra, msgb_bcid(msg)); /* Update the MM context with the new (i.e. foreign) TLLI */ mmctx->gb.tlli = msgb_tlli(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:06:40 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:06:40 +0000 Subject: Change in osmo-sgsn[master]: gsup: send RAT type on LU References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16745 ) Change subject: gsup: send RAT type on LU ...................................................................... gsup: send RAT type on LU At 36c3, osmo-hlr was run with a patch that records the RAN type of attached subscribers. Even though this is not in osmo-hlr master, it is nice information to send along. Note that the "Supported RAT Types" IE is used to send the actually attached RAT. Could be a reason to not merge this to master as-is. Change-Id: I5dbe610738aed7ea1edf6b33543b1c03818cc274 --- M src/sgsn/gprs_subscriber.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/45/16745/1 diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c index 484c7ef..d19ee56 100644 --- a/src/sgsn/gprs_subscriber.c +++ b/src/sgsn/gprs_subscriber.c @@ -812,7 +812,7 @@ return gprs_subscr_tx_gsup_message(subscr, &gsup_msg); } -int gprs_subscr_location_update(struct gprs_subscr *subscr) +int gprs_subscr_location_update(struct gprs_subscr *subscr, enum sgsn_ran_type ran_type) { struct osmo_gsup_message gsup_msg = {0}; @@ -820,6 +820,20 @@ "subscriber data is not available\n"); gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; + + switch (ran_type) { + case MM_CTX_T_GERAN_Gb: + gsup_msg.supported_rat_types[0] = OSMO_RAT_GERAN_A; + gsup_msg.supported_rat_types_len = 1; + break; + case MM_CTX_T_UTRAN_Iu: + gsup_msg.supported_rat_types[0] = OSMO_RAT_UTRAN_IU; + gsup_msg.supported_rat_types_len = 1; + break; + default: + break; + } + return gprs_subscr_tx_gsup_message(subscr, &gsup_msg); } @@ -884,7 +898,7 @@ subscr->flags |= GPRS_SUBSCRIBER_UPDATE_LOCATION_PENDING; - rc = gprs_subscr_location_update(subscr); + rc = gprs_subscr_location_update(subscr, mmctx->ran_type); gprs_subscr_put(subscr); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5dbe610738aed7ea1edf6b33543b1c03818cc274 Gerrit-Change-Number: 16745 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:15:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:15:15 +0000 Subject: Change in libosmocore[master]: usb: Use OSMO_STRLCPY where appropriate References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16746 ) Change subject: usb: Use OSMO_STRLCPY where appropriate ...................................................................... usb: Use OSMO_STRLCPY where appropriate Change-Id: I6b2a90fd8f4b042a1e38dbf8e99414a94a290375 --- M src/usb/osmo_libusb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/16746/1 diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 5b012b8..b10f5be 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -276,7 +276,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); + OSMO_STRLCPY_ARRAY(out[out_idx].path, path); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b2a90fd8f4b042a1e38dbf8e99414a94a290375 Gerrit-Change-Number: 16746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 6 17:17:01 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:17:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136b91d485e_2d9c2b276ec9e60c6619fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb15 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 17:16:47 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.997237] sysrq: SysRq : Power Off [ 24s] [ 8.004716] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb15 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 17:16:50 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:17:18 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:17:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136babdda90_2d9c2b276ec9e60c66207d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc ... [ 39s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 39s] running gawk postinstall script [ 40s] querying package ids... [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] cloud123 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 17:17:08 UTC 2020. [ 40s] [ 40s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 40s] ### VM INTERACTION START ### [ 44s] [ 8.125747] sysrq: SysRq : Power Off [ 44s] [ 8.137485] reboot: Power down [ 44s] ### VM INTERACTION END ### [ 44s] [ 44s] cloud123 failed "build osmo-gsm-manuals-dev_0.3.0.dsc" at Mon Jan 6 17:17:12 UTC 2020. [ 44s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:17:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:17:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bcb20174_2d9c2b276ec9e60c662146@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build71 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 17:17:42 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 5.733203] sysrq: SysRq : Power Off [ 17s] [ 5.735295] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build71 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 17:17:45 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:17:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:17:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bcbe75cb_2d9c2b276ec9e60c66231f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build81 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 17:17:45 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 5.750798] sysrq: SysRq : Power Off [ 17s] [ 5.752508] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build81 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 17:17:48 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:17:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:17:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bcc57161_2d9c2b276ec9e60c662457@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/513] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] build73 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 17:17:47 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.137490] sysrq: SysRq : Power Off [ 24s] [ 7.141508] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] build73 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Mon Jan 6 17:17:51 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:09 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136beb3554f_2d9c2b276ec9e60c66253d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] lamb19 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 17:17:50 UTC 2020. [ 26s] [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] ### VM INTERACTION START ### [ 30s] [ 9.731345] sysrq: SysRq : Power Off [ 30s] [ 9.751023] reboot: Power down [ 30s] ### VM INTERACTION END ### [ 30s] [ 30s] lamb19 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 17:17:54 UTC 2020. [ 30s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:09 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136beb9a2e5_2d9c2b276ec9e60c662672@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb72 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 17:17:53 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.785407] sysrq: SysRq : Power Off [ 25s] [ 7.792839] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb72 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 17:17:56 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:09 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bec25eb5_2d9c2b276ec9e60c662784@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb54 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 17:17:56 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.763545] sysrq: SysRq : Power Off [ 25s] [ 7.770568] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb54 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 17:17:59 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136becb8754_2d9c2b276ec9e60c662869@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 33s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 33s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 33s] running base-passwd preinstall script [ 33s] running base-passwd postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running user-setup postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running base-files postinstall script [ 33s] running gawk postinstall script [ 34s] querying package ids... [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] installing [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] exit ... [ 34s] [ 34s] cloud103 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 17:18:08 UTC 2020. [ 34s] [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] ### VM INTERACTION START ### [ 38s] [ 8.064405] sysrq: SysRq : Power Off [ 38s] [ 8.068656] reboot: Power down [ 38s] ### VM INTERACTION END ### [ 38s] [ 38s] cloud103 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 17:18:12 UTC 2020. [ 38s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bed203c9_2d9c2b276ec9e60c662919@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb02 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 17:18:08 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.232194] sysrq: SysRq : Power Off [ 27s] [ 8.242591] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb02 failed "build osmo-sip-connector_1.4.0.dsc" at Mon Jan 6 17:18:12 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bed7ebd8_2d9c2b276ec9e60c66309e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 26s] running base-passwd preinstall script [ 26s] running base-passwd postinstall script [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] running user-setup postinstall script [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] running base-files postinstall script [ 26s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] installing [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] exit ... [ 27s] [ 27s] cloud123 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 17:18:08 UTC 2020. [ 27s] [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] ### VM INTERACTION START ### [ 30s] [ 8.259231] sysrq: SysRq : Power Off [ 30s] [ 8.264116] reboot: Power down [ 30s] ### VM INTERACTION END ### [ 30s] [ 30s] cloud123 failed "build osmo-hlr_1.2.0.dsc" at Mon Jan 6 17:18:12 UTC 2020. [ 30s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bee312a_2d9c2b276ec9e60c6631cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 35s] running base-passwd preinstall script [ 35s] running base-passwd postinstall script [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] running user-setup postinstall script [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] running base-files postinstall script [ 35s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 36s] [ 36s] cloud124 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 17:18:10 UTC 2020. [ 36s] [ 36s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 36s] ### VM INTERACTION START ### [ 39s] [ 8.052063] sysrq: SysRq : Power Off [ 39s] [ 8.059114] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] cloud124 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 17:18:13 UTC 2020. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bee62512_2d9c2b276ec9e60c66326a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] build34 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 17:18:11 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 28s] [ 7.733705] sysrq: SysRq : Power Off [ 28s] [ 7.736418] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] build34 failed "build osmo-pcu_0.8.0.dsc" at Mon Jan 6 17:18:15 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136beec77f4_2d9c2b276ec9e60c663330@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb53 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 17:18:12 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.907263] sysrq: SysRq : Power Off [ 26s] [ 7.914503] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb53 failed "build osmo-ggsn_1.5.0.dsc" at Mon Jan 6 17:18:16 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136bef1fa20_2d9c2b276ec9e60c6634d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/511] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] build36 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 17:18:13 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 7.655232] sysrq: SysRq : Power Off [ 27s] [ 7.729770] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] build36 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 17:18:16 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136befb96c9_2d9c2b276ec9e60c663560@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb07 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 17:18:14 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.578076] sysrq: SysRq : Power Off [ 26s] [ 7.583632] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb07 failed "build osmo-mgw_1.7.0.dsc" at Mon Jan 6 17:18:17 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:18:43 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:18:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c05e231a_2d9c2b276ec9e60c6637ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/osmo-bts_1.2.0.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 34s] querying package ids... [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] installing [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] exit ... [ 35s] [ 35s] cloud135 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 17:18:38 UTC 2020. [ 35s] [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] ### VM INTERACTION START ### [ 38s] [ 8.938984] sysrq: SysRq : Power Off [ 38s] [ 8.949887] reboot: Power down [ 38s] ### VM INTERACTION END ### [ 38s] [ 38s] cloud135 failed "build osmo-bts_1.2.0.dsc" at Mon Jan 6 17:18:42 UTC 2020. [ 38s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:19:01 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:19:01 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c2473949_2d9c2b276ec9e60c6638c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 46s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 46s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 46s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 46s] running base-passwd preinstall script [ 46s] running base-passwd postinstall script [ 46s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] running user-setup postinstall script [ 46s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 46s] running base-files postinstall script [ 47s] running gawk postinstall script [ 49s] querying package ids... [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] installing [ 50s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] exit ... [ 50s] [ 50s] cloud115 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 17:18:44 UTC 2020. [ 50s] [ 50s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 50s] ### VM INTERACTION START ### [ 53s] [ 11.920217] sysrq: SysRq : Power Off [ 53s] [ 11.935802] reboot: Power down [ 53s] ### VM INTERACTION END ### [ 53s] [ 53s] cloud115 failed "build libosmo-sccp_1.2.0.dsc" at Mon Jan 6 17:18:48 UTC 2020. [ 53s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:19:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:19:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c4592c41_2d9c2b276ec9e60c66405d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 22s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb54 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 17:19:48 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.000801] sysrq: SysRq : Power Off [ 26s] [ 8.014503] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb54 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 17:19:51 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:19:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:19:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c4655819_2d9c2b276ec9e60c6641d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 24s] running gawk postinstall script [ 24s] querying package ids... [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] installing [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] exit ... [ 25s] [ 25s] lamb23 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 17:19:39 UTC 2020. [ 25s] [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] ### VM INTERACTION START ### [ 28s] [ 8.272529] sysrq: SysRq : Power Off [ 28s] [ 8.311356] reboot: Power down [ 28s] ### VM INTERACTION END ### [ 28s] [ 28s] lamb23 failed "build osmo-bsc_1.6.0.dsc" at Mon Jan 6 17:19:43 UTC 2020. [ 28s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:19:52 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:19:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c46b4e20_2d9c2b276ec9e60c6642c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.1.a79aa.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb56 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 17:19:40 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.335945] sysrq: SysRq : Power Off [ 27s] [ 8.349803] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb56 failed "build osmo-msc_1.6.0.1.a79aa.dsc" at Mon Jan 6 17:19:44 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:20:09 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:20:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c609ad73_2d9c2b276ec9e60c66431d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 34s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 34s] querying package ids... [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] installing [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] exit ... [ 35s] [ 35s] cloud115 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 17:19:55 UTC 2020. [ 35s] [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] ### VM INTERACTION START ### [ 38s] [ 16.786906] sysrq: SysRq : Power Off [ 38s] [ 16.796645] reboot: Power down [ 38s] ### VM INTERACTION END ### [ 38s] [ 38s] cloud115 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 17:19:58 UTC 2020. [ 38s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:20:09 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:20:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c613a3cf_2d9c2b276ec9e60c664429@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 31s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] processing recipe /.build-srcdir/osmo-msc_1.6.0.dsc ... [ 31s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 31s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.dsc build ... [ 31s] running base-passwd preinstall script [ 31s] running base-passwd postinstall script [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] running user-setup postinstall script [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] running base-files postinstall script [ 31s] running gawk postinstall script [ 31s] querying package ids... [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 31s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] installing [ 32s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] exit ... [ 32s] [ 32s] cloud107 failed "build osmo-msc_1.6.0.dsc" at Mon Jan 6 17:20:04 UTC 2020. [ 32s] [ 32s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 32s] ### VM INTERACTION START ### [ 35s] [ 8.213327] sysrq: SysRq : Power Off [ 35s] [ 8.219476] reboot: Power down [ 35s] ### VM INTERACTION END ### [ 35s] [ 35s] cloud107 failed "build osmo-msc_1.6.0.dsc" at Mon Jan 6 17:20:07 UTC 2020. [ 35s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 17:20:43 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:20:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e136c8088d96_2d9c2b276ec9e60c6645ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb51 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 17:20:31 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 8.138971] sysrq: SysRq : Power Off [ 27s] [ 8.145597] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb51 failed "build osmo-sgsn_1.6.0.dsc" at Mon Jan 6 17:20:35 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:23:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:23:54 +0000 Subject: Change in osmo-msc[master]: vlr_gsup_rx: fix uninitialized rc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16742 ) Change subject: vlr_gsup_rx: fix uninitialized rc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id7776a473b8356d1d136d78736698f20accc7a36 Gerrit-Change-Number: 16742 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:23:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:24:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:24:17 +0000 Subject: Change in osmo-msc[master]: vlr.c: fix condition to check MSISDN presence In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16743 ) Change subject: vlr.c: fix condition to check MSISDN presence ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib2294d2cd339c36df599d7d134f979a572ac308a Gerrit-Change-Number: 16743 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:24:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:24:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:24:21 +0000 Subject: Change in osmo-msc[master]: vlr_gsup_rx: fix uninitialized rc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16742 ) Change subject: vlr_gsup_rx: fix uninitialized rc ...................................................................... vlr_gsup_rx: fix uninitialized rc Change-Id: Id7776a473b8356d1d136d78736698f20accc7a36 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 1a753dc..f644df8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1069,7 +1069,7 @@ { struct vlr_instance *vlr = data; struct vlr_subscr *vsub; - int rc; + int rc = 0; vsub = vlr_subscr_find_by_imsi(vlr, gsup->imsi, __func__); if (!vsub) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id7776a473b8356d1d136d78736698f20accc7a36 Gerrit-Change-Number: 16742 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:24:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:24:21 +0000 Subject: Change in osmo-msc[master]: vlr.c: fix condition to check MSISDN presence In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16743 ) Change subject: vlr.c: fix condition to check MSISDN presence ...................................................................... vlr.c: fix condition to check MSISDN presence msisdn_enc is a buffer, its address is always != 0 Change-Id: Ib2294d2cd339c36df599d7d134f979a572ac308a --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f644df8..b164fd8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -784,7 +784,7 @@ unsigned idx; int rc; - if (gsup_msg->msisdn_enc) {//FIXME: vlr_subscr_set_msisdn()? + if (gsup_msg->msisdn_enc_len) {//FIXME: vlr_subscr_set_msisdn()? gsm48_decode_bcd_number2(vsub->msisdn, sizeof(vsub->msisdn), gsup_msg->msisdn_enc, gsup_msg->msisdn_enc_len, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib2294d2cd339c36df599d7d134f979a572ac308a Gerrit-Change-Number: 16743 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:26:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:26:24 +0000 Subject: Change in osmo-sgsn[master]: gsup: send RAT type on LU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16745 ) Change subject: gsup: send RAT type on LU ...................................................................... Patch Set 1: Code-Review-1 We do have the current_rat_type in the GSUP message and in our GSUP API. I see no reason why we wouldn't want to use this (correct) one. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5dbe610738aed7ea1edf6b33543b1c03818cc274 Gerrit-Change-Number: 16745 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:26:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:26:47 +0000 Subject: Change in libosmocore[master]: usb: Use OSMO_STRLCPY where appropriate In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16746 ) Change subject: usb: Use OSMO_STRLCPY where appropriate ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b2a90fd8f4b042a1e38dbf8e99414a94a290375 Gerrit-Change-Number: 16746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:26:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:26:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:26:50 +0000 Subject: Change in libosmocore[master]: usb: Use OSMO_STRLCPY where appropriate In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16746 ) Change subject: usb: Use OSMO_STRLCPY where appropriate ...................................................................... usb: Use OSMO_STRLCPY where appropriate Change-Id: I6b2a90fd8f4b042a1e38dbf8e99414a94a290375 --- M src/usb/osmo_libusb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 5b012b8..b10f5be 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -276,7 +276,7 @@ out[out_idx].vendor = dev_desc.idVendor; out[out_idx].product = dev_desc.idProduct; out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); + OSMO_STRLCPY_ARRAY(out[out_idx].path, path); out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; out[out_idx].configuration = conf_desc->bConfigurationValue; out[out_idx].interface = if_desc->bInterfaceNumber; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b2a90fd8f4b042a1e38dbf8e99414a94a290375 Gerrit-Change-Number: 16746 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:27:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:27:03 +0000 Subject: Change in osmo-e1d[master]: contrib: add e1-prbs-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16735 ) Change subject: contrib: add e1-prbs-test ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 Gerrit-Change-Number: 16735 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:27:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:27:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:27:06 +0000 Subject: Change in osmo-e1d[master]: contrib: add e1-prbs-test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16735 ) Change subject: contrib: add e1-prbs-test ...................................................................... contrib: add e1-prbs-test e1-prbs-test is a small utility that can be used to do PRBS testing on E1/T1 lines using DAHDI cards. A transmiter and receiver are exchanging timeslot-specific PRBS sequences. Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 --- A contrib/e1-prbs-test/Makefile A contrib/e1-prbs-test/README A contrib/e1-prbs-test/internal.h A contrib/e1-prbs-test/main.c A contrib/e1-prbs-test/prbs.c A contrib/e1-prbs-test/rx.c A contrib/e1-prbs-test/tx.c A contrib/e1-prbs-test/utils.c 8 files changed, 727 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile new file mode 100644 index 0000000..726befc --- /dev/null +++ b/contrib/e1-prbs-test/Makefile @@ -0,0 +1,16 @@ +LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore) +LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore) + +CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) +LIBS=$(LIBOSMO_LIBS) + +all: e1-prbs-test + +e1-prbs-test: main.o rx.o tx.o prbs.o utils.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + +%.o: %.c + $(CC) $(CFLAGS) -o $@ -c $^ + +clean: + @rm -f e1-prbs-test e1-prbs-test *.o diff --git a/contrib/e1-prbs-test/README b/contrib/e1-prbs-test/README new file mode 100644 index 0000000..903cc39 --- /dev/null +++ b/contrib/e1-prbs-test/README @@ -0,0 +1,36 @@ +e1-prbs-test - Utility to test for bit errors on E1 lines using DAHDI +====================================================================== + +e1-prbs-test can be used to test for bit errors in E1 transmission +lines. It consists of a sender and a receiver, which should be used +on either end of the E1 line. + +Transmitter and receiver can be on the same machine, or on different +machines. + +The code currently works directly on DAHDI, so only DAHDI-supported E1 +cards are supported at this point. + +The test works by sending timeslot-specific PRBS sequences of 512 bit +(64byte) length on the transmit side, and by correlating to those PRBS +sequences on the receiver side. + +The use is relatively simple: + +For the A-side, assuming you would want to use DAHDI span 1: + e1-prbs-test /dev/dahdi/chan/001 + +For the B-side, assuming you would want to use DAHDI span 2: + e1-prbs-test /dev/dahdi/chan/002 + +The test will run indefinitely. + +If you'd like to get an interim report, send a SIGHUP to +e1-prbs-test. + +If you'd like to stop, simply press Ctrl+C. +There is a two-stage shut-down process. When you press Ctrl+C for +the first time, the report is printed, but transmission continues. At +the second Ctrl+C, the process terminates. You must press Ctrl+C for +the first time on both A and B side, before pressing it the second time +on the A-side in order to get correct results. diff --git a/contrib/e1-prbs-test/internal.h b/contrib/e1-prbs-test/internal.h new file mode 100644 index 0000000..681648a --- /dev/null +++ b/contrib/e1-prbs-test/internal.h @@ -0,0 +1,65 @@ +#pragma once + +#include +#include +#include + +#define MAX_NR_TS 31 +#define PRBS_LEN 2048 + +/* prbs.c */ + +struct timeslot_state; +struct prbs_precomp { + uint8_t bytes[PRBS_LEN/8]; +}; + +void prbs_for_ts_nr(struct osmo_prbs *prbs, uint8_t ts_nr); + +void prbs_precomp(struct prbs_precomp *out, const struct osmo_prbs *prbs); +void ts_init_prbs_tx(struct timeslot_state *ts, unsigned int prbs_offs_tx); +void ts_init_prbs_rx(struct timeslot_state *ts, unsigned int prbs_offs_rx); + +/* utils.c */ +uint8_t bits_set_in_byte(uint8_t byte); +void cfg_dahdi_buffer(int fd); +void set_realtime(int rt_prio); + + +struct timeslot_state_tx { + struct osmo_prbs prbs; /* PRBS definition */ + struct prbs_precomp prbs_pc; /* pre-computed PRBS bytes */ + unsigned int prbs_pc_idx; /* next to-be-transmitted byte offset in prbs_pc */ +}; + +struct timeslot_state_rx { + struct osmo_prbs prbs; /* PRBS definition */ + struct prbs_precomp prbs_pc[8]; /* bit-shifted pre-computed PRBS sequences */ + struct { + bool has_sync; /* do we have a PRBS sync? */ + struct timespec ts_sync; /* time at which sync was established */ + unsigned int prbs_pc_num; /* index to prbs_pc[] array */ + unsigned int prbs_pc_offset; /* offset of next byte into prbs_pc[pc_num].bytes[] */ + + unsigned int num_bit_err; /* bit errors since last sync */ + unsigned int num_sync_loss; /* number of sync losses since start */ + } sync_state; +}; + + +struct timeslot_state { + struct osmo_fd ofd; + struct timeslot_state_tx tx; + struct timeslot_state_rx rx; +}; + +struct test_state { + struct timeslot_state ts[MAX_NR_TS]; + unsigned int next_unused_ts; +}; + +/* rx.c */ +void process_rx(struct timeslot_state_rx *tsr, unsigned int ts_nr, const uint8_t *data, unsigned int len); + +/* tx.c */ +void process_tx(struct timeslot_state *ts, int len); diff --git a/contrib/e1-prbs-test/main.c b/contrib/e1-prbs-test/main.c new file mode 100644 index 0000000..4fe0e84 --- /dev/null +++ b/contrib/e1-prbs-test/main.c @@ -0,0 +1,208 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "internal.h" + +static struct test_state g_tst; +static int g_prbs_offs_rx; +static int g_prbs_offs_tx; + +static int e1_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct timeslot_state *ts = ofd->data; + uint8_t buf[4096]; + int rc, len; + + OSMO_ASSERT(what & OSMO_FD_READ); + + /* read whatever data */ + rc = read(ofd->fd, buf, sizeof(buf)); + if (rc < 0) { + fprintf(stderr, "E1TS(%d) read: %d (%s)\n", ofd->priv_nr, rc, strerror(errno)); + return rc; + } + len = rc; + process_rx(&ts->rx, ofd->priv_nr, buf, len); + + /* generate as many bytes as were read */ + process_tx(ts, len); + + return 0; +} + +static int open_slots(struct test_state *tst, const char *basedir) +{ + DIR *dir = opendir(basedir); + struct dirent *ent; + int rc, num_slots = 0; + + if (!dir) + return -ENOENT; + + while ((ent = readdir(dir))) { + struct timeslot_state *ts; + switch (ent->d_type) { + case DT_CHR: + case DT_FIFO: + case DT_SOCK: + break; + default: + printf("%s: skipping\n", ent->d_name); + continue; + } + + rc = openat(dirfd(dir), ent->d_name, O_RDWR); + if (rc < 0) { + fprintf(stderr, "Error opening %s: %d (%s)\n", ent->d_name, rc, strerror(errno)); + return -1; + } + ts = &tst->ts[tst->next_unused_ts++]; + + /* open the respective file descriptor */ + osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name)); + osmo_fd_register(&ts->ofd); + printf("E1TS(%02u) opened\n", ts->ofd.priv_nr); + + ts_init_prbs_tx(ts, g_prbs_offs_tx); + ts_init_prbs_rx(ts, g_prbs_offs_rx); + + /* start to put something into the transmit queue, before we get read-triggered + * later on */ + process_tx(ts, 1024); + + cfg_dahdi_buffer(ts->ofd.fd); + struct dahdi_bufferinfo bi; + rc = ioctl(ts->ofd.fd, DAHDI_GET_BUFINFO, &bi); + OSMO_ASSERT(rc == 0); + printf("tx_pol=%d, rx_pol=%d, num=%d, size=%d, nread=%d, nwrite=%d\n", + bi.txbufpolicy, bi.rxbufpolicy, bi.numbufs, bi.bufsize, bi.readbufs, bi.writebufs); + num_slots++; + } + closedir(dir); + return num_slots; +} + +static void print_report(void) +{ + struct timespec ts_now; + int i; + + clock_gettime(CLOCK_MONOTONIC, &ts_now); + + for (i = 0; i < ARRAY_SIZE(g_tst.ts); i++) { + const struct timeslot_state *ts = &g_tst.ts[i]; + printf("E1TS(%02u) STATS: sync_losses=%u, bit_errs=%u in %lu seconds\n", + ts->ofd.priv_nr, ts->rx.sync_state.num_sync_loss, ts->rx.sync_state.num_bit_err, + ts_now.tv_sec - ts->rx.sync_state.ts_sync.tv_sec); + } +} + +static int g_ctrlc_count = 0; + +static void sig_handler(int signal) +{ + switch (signal) { + case SIGINT: + g_ctrlc_count++; + if (g_ctrlc_count == 1) { + print_report(); + printf("\nPlease stop remote end before pressing Ctrl+C another time\n"); + } + if (g_ctrlc_count > 1) + exit(0); + break; + case SIGHUP: + print_report(); + break; + } +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int c; + static const struct option long_opts[] = { + { "rx-prbs-offset", 1, 0, 'r' }, + { "tx-prbs-offset", 1, 0, 't' }, + { 0, 0, 0, 0 } + }; + c = getopt_long(argc, argv, "r:t:", long_opts, NULL); + if (c == -1) + break; + + switch (c) { + case 'r': + g_prbs_offs_rx = atoi(optarg); + break; + case 't': + g_prbs_offs_tx = atoi(optarg); + break; + default: + exit(1); + } + } +} + +int main(int argc, char **argv) +{ + char *basedir; + int rc; + + handle_options(argc, argv); + + if (argc <= optind) { + fprintf(stderr, "You must specify the base-path of your DAHDI span " + "like /dev/dahdi/chan/001\n"); + exit(1); + } + basedir = argv[optind]; + + set_realtime(10); + rc = open_slots(&g_tst, basedir); + printf("==> opened a total of %d slots\n", rc); + + signal(SIGINT, sig_handler); + signal(SIGHUP, sig_handler); + while (1) { + osmo_select_main(0); + } +} diff --git a/contrib/e1-prbs-test/prbs.c b/contrib/e1-prbs-test/prbs.c new file mode 100644 index 0000000..ed8a80a --- /dev/null +++ b/contrib/e1-prbs-test/prbs.c @@ -0,0 +1,183 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include + +#include "internal.h" + +/* according to https://users.ece.cmu.edu/~koopman/lfsr/index.html all below + * coefficients should render maximal length LFSRs of 11bit (2048) length */ +static const uint32_t prbs11_coeff[] = { + 0x402, + 0x40B, + 0x415, + 0x416, + 0x423, + 0x431, + 0x432, + 0x438, + 0x43D, + 0x446, + 0x44A, + 0x44F, + 0x454, + 0x458, + 0x467, + 0x468, + 0x470, + 0x473, + 0x475, + 0x47A, + 0x486, + 0x489, + 0x492, + 0x494, + 0x49D, + 0x49E, + 0x4A2, + 0x4A4, + 0x4A8, + 0x4AD, + 0x4B9, + 0x4BA, + 0x4BF, + 0x4C1, + 0x4C7, + 0x4D5, + 0x4D6, + 0x4DC, + 0x4E3, + 0x4EC, + 0x4F2, + 0x4FB, + 0x500, + 0x503, + 0x509, + 0x50A, + 0x514, + 0x524, + 0x530, + 0x536, + 0x53C, + 0x53F, + 0x542, + 0x548, + 0x54E, + 0x553, + 0x555, + 0x559, + 0x55A, + 0x56A, + 0x56F, + 0x574, + 0x577, + 0x578, + 0x57D, + 0x581, + 0x584, + 0x588, + 0x599, + 0x59F, + 0x5A0, + 0x5A5, + 0x5AC, + 0x5AF, + 0x5B2, + 0x5B7, + 0x5BE, + 0x5C3, + 0x5C5, + 0x5C9, + 0x5CA, + 0x5D7, + 0x5DB, + 0x5DE, + 0x5E4, + 0x5ED, + 0x5EE, + 0x5F3, + 0x5F6, + 0x605, + 0x606, + 0x60C, + 0x60F, + 0x62B, + 0x630, + 0x635, + 0x639, + 0x642, + 0x644, + 0x64B +}; + +/* build the PRBS description for a given timeslot number */ +void prbs_for_ts_nr(struct osmo_prbs *prbs, uint8_t ts_nr) +{ + + OSMO_ASSERT(ts_nr < ARRAY_SIZE(prbs11_coeff)); + prbs->name = "custom"; + prbs->len = 11; + prbs->coeff = prbs11_coeff[ts_nr]; +} + +/* compute one full sequence of the given PRBS */ +void prbs_precomp(struct prbs_precomp *out, const struct osmo_prbs *prbs) +{ + struct osmo_prbs_state prbs_s; + int i; + + osmo_prbs_state_init(&prbs_s, prbs); + for (i = 0; i < sizeof(out->bytes); i++) { + ubit_t ubit[8]; + osmo_prbs_get_ubits(ubit, sizeof(ubit), &prbs_s); + osmo_ubit2pbit(&out->bytes[i], ubit, sizeof(ubit)); + } +} + +void ts_init_prbs_tx(struct timeslot_state *ts, unsigned int prbs_offs_tx) +{ + unsigned int prbs_nr = prbs_offs_tx + ts->ofd.priv_nr; + /* initialize the transmit-side PRNG for this slot */ + printf("Selecting PRBS11 #%02u for Tx of TS%02u\n", prbs_nr, ts->ofd.priv_nr); + prbs_for_ts_nr(&ts->tx.prbs, prbs_nr); + prbs_precomp(&ts->tx.prbs_pc, &ts->tx.prbs); +} + +void ts_init_prbs_rx(struct timeslot_state *ts, unsigned int prbs_offs_rx) +{ + unsigned int prbs_nr = prbs_offs_rx + ts->ofd.priv_nr; + /* initialize the receive-side PRNG for this slot */ + ubit_t ubit[PRBS_LEN*2]; + printf("Selecting PRBS11 #%02u for Rx of TS%02u\n", prbs_nr, ts->ofd.priv_nr); + prbs_for_ts_nr(&ts->rx.prbs, prbs_nr); + prbs_precomp(&ts->rx.prbs_pc[0], &ts->rx.prbs); + osmo_pbit2ubit(ubit, ts->rx.prbs_pc[0].bytes, PRBS_LEN); + /* copy buffer twice back-to-back */ + memcpy(ubit+PRBS_LEN, ubit, PRBS_LEN); + + /* pre-compute bit-shifted versions */ + for (int i = 1; i < ARRAY_SIZE(ts->rx.prbs_pc); i++) { + osmo_ubit2pbit_ext(ts->rx.prbs_pc[i].bytes, 0, ubit, i, PRBS_LEN, 0); + //printf("%d: %s\n", i, osmo_hexdump_nospc(ts->prbs_pc[i].bytes, sizeof(ts->prbs_pc[i].bytes))); + } +} diff --git a/contrib/e1-prbs-test/rx.c b/contrib/e1-prbs-test/rx.c new file mode 100644 index 0000000..bb6967d --- /dev/null +++ b/contrib/e1-prbs-test/rx.c @@ -0,0 +1,106 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "internal.h" + +static uint8_t next_prbs_pc_byte(struct timeslot_state_rx *tsr) +{ + const struct prbs_precomp *pc = &tsr->prbs_pc[tsr->sync_state.prbs_pc_num]; + uint8_t ret = pc->bytes[tsr->sync_state.prbs_pc_offset]; + tsr->sync_state.prbs_pc_offset = (tsr->sync_state.prbs_pc_offset + 1) % sizeof(pc->bytes); + return ret; +} + +/* compare if received buffer matches PRBS; count number of different bits */ +static unsigned int compare_buf(struct timeslot_state_rx *tsr, const uint8_t *data, unsigned int len) +{ + unsigned int i, num_wrong_bits = 0; + + for (i = 0; i < len; i++) { + uint8_t bt = next_prbs_pc_byte(tsr); + if (data[i] != bt) { + uint8_t x = data[i] ^ bt; + num_wrong_bits += bits_set_in_byte(x); + } + } + return num_wrong_bits; +} + +/* process incoming received data; try to correlate with prbs sequence */ +void process_rx(struct timeslot_state_rx *tsr, unsigned int ts_nr, const uint8_t *data, unsigned int len) +{ + if (!tsr->sync_state.has_sync) { + unsigned int pc_num; + /* we haven't synced yet and must attempt to sync to the pattern. We will try + * to match each pattern */ + for (pc_num = 0; pc_num < ARRAY_SIZE(tsr->prbs_pc); pc_num++) { + const struct prbs_precomp *pc = &tsr->prbs_pc[pc_num]; + uint8_t *found; + long int offset; + + OSMO_ASSERT(len > sizeof(pc->bytes)); + found = memmem(data, len, pc->bytes, sizeof(pc->bytes)); + if (!found) + continue; + + offset = (found - data); + printf("E1TS(%02u) FOUND SYNC (pc_num=%u, offset=%li)\n", ts_nr, + pc_num, offset); + clock_gettime(CLOCK_MONOTONIC, &tsr->sync_state.ts_sync); + tsr->sync_state.has_sync = true; + tsr->sync_state.prbs_pc_num = pc_num; + tsr->sync_state.prbs_pc_offset = (sizeof(pc->bytes) - offset) % sizeof(pc->bytes); + tsr->sync_state.num_bit_err = 0; + /* FIXME: compare the remainder of the buffer */ + return; + } + } + if (tsr->sync_state.has_sync) { + unsigned int num_wrong_bits; + /* we already have sync */ + num_wrong_bits = compare_buf(tsr, data, len); + if (num_wrong_bits >= len*8/4) { /* more than 25% of wrong bits */ + struct timespec ts_now; + clock_gettime(CLOCK_MONOTONIC, &ts_now); + printf("E1TS(%02u) LOST SYNC after %u of %u wrong bits in one buffer; " + "until now, total bit errors %u in %lu seconds\n", ts_nr, + num_wrong_bits, len*8, tsr->sync_state.num_bit_err, + ts_now.tv_sec - tsr->sync_state.ts_sync.tv_sec); + tsr->sync_state.has_sync = false; + tsr->sync_state.num_sync_loss++; + } + tsr->sync_state.num_bit_err += num_wrong_bits; + } +} diff --git a/contrib/e1-prbs-test/tx.c b/contrib/e1-prbs-test/tx.c new file mode 100644 index 0000000..6d775d7 --- /dev/null +++ b/contrib/e1-prbs-test/tx.c @@ -0,0 +1,47 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "internal.h" + +void process_tx(struct timeslot_state *ts, int len) +{ + uint8_t buf[4096]; + int i, rc; + + for (i = 0; i < len; i++) { + buf[i] = ts->tx.prbs_pc.bytes[ts->tx.prbs_pc_idx]; + ts->tx.prbs_pc_idx = (ts->tx.prbs_pc_idx + 1) % sizeof(ts->tx.prbs_pc); + } + rc = write(ts->ofd.fd, buf, len); + if (rc != len) + fprintf(stderr, "E1TS(%02u) write: %d bytes less than %d\n", ts->ofd.priv_nr, rc, len); +} diff --git a/contrib/e1-prbs-test/utils.c b/contrib/e1-prbs-test/utils.c new file mode 100644 index 0000000..5610e80 --- /dev/null +++ b/contrib/e1-prbs-test/utils.c @@ -0,0 +1,66 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +/* we could generate a lookup table at start ... */ +uint8_t bits_set_in_byte(uint8_t byte) +{ + uint8_t ret = 0; + int i; + + for (i = 0; i < 8; i++) { + if (byte & (1 << i)) + ret += 1; + } + return ret; +} + +void cfg_dahdi_buffer(int fd) +{ + struct dahdi_bufferinfo bi = { + .txbufpolicy = DAHDI_POLICY_WHEN_FULL, /* default is immediate */ + .rxbufpolicy = DAHDI_POLICY_WHEN_FULL, /* default is immediate */ + .numbufs = 8, /* default is 2 */ + .bufsize = 1024, /* default is 1024 */ + .readbufs = -1, + .writebufs = -1, + }; + OSMO_ASSERT(ioctl(fd, DAHDI_SET_BUFINFO, &bi) == 0); +} + +void set_realtime(int rt_prio) +{ + struct sched_param param; + int rc; + + memset(¶m, 0, sizeof(param)); + param.sched_priority = rt_prio; + rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); + OSMO_ASSERT(rc == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib25d266e61e0d70919cc4e65d5b1bf0bc9ec7d00 Gerrit-Change-Number: 16735 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:27:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:27:14 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add initial code for checking ICE40-E1 traces In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16741 ) Change subject: e1-prbs-test: Add initial code for checking ICE40-E1 traces ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I084a9737c9e051dcadf971e39e32f10f89aecfbd Gerrit-Change-Number: 16741 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jan 2020 17:27:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:27:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jan 2020 17:27:18 +0000 Subject: Change in osmo-e1d[master]: e1-prbs-test: Add initial code for checking ICE40-E1 traces In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16741 ) Change subject: e1-prbs-test: Add initial code for checking ICE40-E1 traces ...................................................................... e1-prbs-test: Add initial code for checking ICE40-E1 traces The idea of this code is to check captures made by ICE40 against the known transmitted per-timeslots PRBS sequences. Change-Id: I084a9737c9e051dcadf971e39e32f10f89aecfbd --- M contrib/e1-prbs-test/Makefile A contrib/e1-prbs-test/ice40-rx.c M contrib/e1-prbs-test/internal.h 3 files changed, 239 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile index 726befc..172847f 100644 --- a/contrib/e1-prbs-test/Makefile +++ b/contrib/e1-prbs-test/Makefile @@ -4,13 +4,16 @@ CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS) LIBS=$(LIBOSMO_LIBS) -all: e1-prbs-test +all: e1-prbs-test ice40-e1-prbs-check e1-prbs-test: main.o rx.o tx.o prbs.o utils.o $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +ice40-e1-prbs-check: ice40-rx.o rx.o prbs.o utils.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ clean: - @rm -f e1-prbs-test e1-prbs-test *.o + @rm -f e1-prbs-test ice40-e1-prbs-check *.o diff --git a/contrib/e1-prbs-test/ice40-rx.c b/contrib/e1-prbs-test/ice40-rx.c new file mode 100644 index 0000000..de0e4f1 --- /dev/null +++ b/contrib/e1-prbs-test/ice40-rx.c @@ -0,0 +1,233 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "internal.h" + +static struct test_state g_tst; +static int g_prbs_offs_rx; +static uint8_t g_usb_endpoint = 0x81; + +#define E1_CHUNK_HDR_MAGIC 0xe115600d /* E1 is good */ +struct e1_chunk_hdr { + uint32_t magic; + struct { + uint64_t sec; + uint64_t usec; + } time; + uint16_t len; /* length of following payload */ + uint8_t ep; /* USB endpoint */ +} __attribute__((packed)); + +struct ts_buf { + uint8_t bytes[1024]; +}; +struct line_ts_buf { + struct ts_buf ts_buf[32]; + unsigned int next_offset; +}; +static struct line_ts_buf g_line_ts_buf; + +static int demux_in(struct test_state *tst, const uint8_t *data, size_t len) +{ + int i; + + if (len % 32) + fprintf(stderr, "Length %zu is not multiple of 32\n", len); + + for (i = 0; i < len; i++) { + uint32_t ts_nr = i % 32; + g_line_ts_buf.ts_buf[ts_nr].bytes[g_line_ts_buf.next_offset] = data[i]; + + /* go to next offset in all per-timeslot buffers */ + if (ts_nr == 31) + g_line_ts_buf.next_offset++; + + /* if per-ts buffers are full, hand them to decoder */ + if (g_line_ts_buf.next_offset >= sizeof(g_line_ts_buf.ts_buf[0].bytes)) { + uint8_t j; + for (j = 0; j < 32; j++) { + struct timeslot_state *ts = &tst->ts[j]; + //printf("process_rx(%u, %s)\n", j, osmo_hexdump(g_line_ts_buf.ts_buf[j].bytes, g_line_ts_buf.next_offset)); + process_rx(&ts->rx, j, g_line_ts_buf.ts_buf[j].bytes, g_line_ts_buf.next_offset); + } + memset(&g_line_ts_buf, 0, sizeof(g_line_ts_buf)); + g_line_ts_buf.next_offset = 0; + } + } + return 0; +} + + +static int process_file(struct test_state *tst, int fd) +{ + struct e1_chunk_hdr hdr; + unsigned long offset = 0; + uint8_t buf[65535]; + int rc; + + while (1) { + /* first read header */ + rc = read(fd, &hdr, sizeof(hdr)); + if (rc < 0) + return rc; + if (rc != sizeof(hdr)) { + fprintf(stderr, "%d is less than header size (%zd)\n", rc, sizeof(hdr)); + return -1; + } + offset += rc; + if (hdr.magic != E1_CHUNK_HDR_MAGIC) { + fprintf(stderr, "offset %lu: Wrong magic 0x%08x\n", offset, hdr.magic); + return -1; + } + + /* then read payload */ + rc = read(fd, buf, hdr.len); + if (rc < 0) + return rc; + offset += rc; + if (rc != hdr.len) { + fprintf(stderr, "%d is less than payload size (%d)\n", rc, hdr.len); + return -1; + } + + /* filter on the endpoint (direction) specified by the user */ + if (hdr.ep != g_usb_endpoint) + continue; + + if (hdr.len <= 4) + continue; + + //printf("> %s\n", osmo_hexdump(buf, hdr.len)); + demux_in(tst, buf+4, hdr.len-4); + } +} + +static int open_file(struct test_state *tst, const char *fname) +{ + int i; + for (i = 0; i < 32; i++) { + struct timeslot_state *ts = &tst->ts[i]; + ts->ofd.priv_nr = i; + ts_init_prbs_rx(ts, g_prbs_offs_rx); + } + + return open(fname, O_RDONLY); +} + +static void print_report(void) +{ + struct timespec ts_now; + int i; + + clock_gettime(CLOCK_MONOTONIC, &ts_now); + + for (i = 0; i < ARRAY_SIZE(g_tst.ts); i++) { + const struct timeslot_state *ts = &g_tst.ts[i]; + printf("E1TS(%02u) STATS: sync_losses=%u, bit_errs=%u in %lu seconds\n", + ts->ofd.priv_nr, ts->rx.sync_state.num_sync_loss, ts->rx.sync_state.num_bit_err, + ts_now.tv_sec - ts->rx.sync_state.ts_sync.tv_sec); + } +} + +static void sig_handler(int signal) +{ + switch (signal) { + case SIGINT: + print_report(); + exit(0); + break; + case SIGHUP: + print_report(); + break; + } +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int c; + static const struct option long_opts[] = { + { "rx-prbs-offset", 1, 0, 'r' }, + { "endpoint", 1, 0, 'e' }, + { 0, 0, 0, 0 } + }; + c = getopt_long(argc, argv, "r:e:", long_opts, NULL); + if (c == -1) + break; + + switch (c) { + case 'r': + g_prbs_offs_rx = atoi(optarg); + break; + case 'e': + g_usb_endpoint = strtoul(optarg, NULL, 16); + break; + default: + exit(1); + } + } +} + +int main(int argc, char **argv) +{ + char *fname; + int rc; + + handle_options(argc, argv); + + if (argc <= optind) { + fprintf(stderr, "You must specify the file name of the ICE40-E1 capture\n"); + exit(1); + } + fname = argv[optind]; + + signal(SIGINT, sig_handler); + signal(SIGHUP, sig_handler); + + rc = open_file(&g_tst, fname); + if (rc < 0) { + fprintf(stderr, "Error opening %s: %s\n", fname, strerror(errno)); + exit(1); + } + process_file(&g_tst, rc); + print_report(); +} diff --git a/contrib/e1-prbs-test/internal.h b/contrib/e1-prbs-test/internal.h index 681648a..a2c4ef5 100644 --- a/contrib/e1-prbs-test/internal.h +++ b/contrib/e1-prbs-test/internal.h @@ -4,7 +4,7 @@ #include #include -#define MAX_NR_TS 31 +#define MAX_NR_TS 32 #define PRBS_LEN 2048 /* prbs.c */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I084a9737c9e051dcadf971e39e32f10f89aecfbd Gerrit-Change-Number: 16741 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 6 17:35:18 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 17:35:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e136fe336fc7_2d9c2b276ec9e60c665722@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 418s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] dh_install -O--fail-missing [ 418s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 418s] dh_install: This feature will be removed in compat 12. [ 418s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 418s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 418s] dh_missing: missing files, aborting [ 418s] The following debhelper tools have reported what they installed (with files per package) [ 418s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 418s] If the missing files are installed by another tool, please file a bug against it. [ 418s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 418s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 418s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 418s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 418s] For a short-term work-around: Add the files to debian/not-installed [ 418s] dh_install: dh_missing --fail-missing returned exit code 255 [ 418s] make: *** [debian/rules:12: binary] Error 255 [ 418s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 418s] [ 418s] cloud120 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 17:35:02 UTC 2020. [ 418s] [ 418s] ### VM INTERACTION START ### [ 421s] [ 388.625640] sysrq: SysRq : Power Off [ 421s] [ 388.631414] reboot: Power down [ 421s] ### VM INTERACTION END ### [ 421s] [ 421s] cloud120 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 17:35:05 UTC 2020. [ 421s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:45:48 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 19: (10 comments) thanks for the review and sorry for missing it earlier... https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c File src/mslookup/mslookup.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 128 PS15, Line 128: strncmp(a->msisdn, b->msisdn, sizeof(a->msisdn)); > What if a->msisdn is e.g. [?] note that the n is sizeof(), i.e. the maximum buffer size, and not the strlen(). This is merely memory sanitation. We are still comparing MSISDNs in full length in all cases. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 130 PS15, Line 130: return 0; > Rather assert() here. we don't know where the id came from, maybe it is random data incoming from the internet. We should absolutely not assert. We could argue whether an unknown ID type should always return not-equal. But at this point we already know that a->type == b->type, so both having an unknown ID type would evaluate as "both are unset/empty/invalid", hence I chose to return 0, in the sense of cmp. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 232 PS15, Line 232: 64 > Given that IPv6 addresses can be quite long, I would use at least 128... 64 is just the initial buffer size, if it needs to be longer, a longer buffer will get allocated in a second printf pass. (Most IPv6 addresses I see end up something like aaaa:bbbb:cccc:dddd::23, i.e. shortened) https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 253 PS15, Line 253: 10 > EINVAL these numbers are a continuation of returning -1..-9 in osmo_mslookup_query_init_from_domain_str(), mostly for debugging: find out which part of the code path didn't like the token. (This is a static function, basically part of osmo_mslookup_query_init_from_domain_str()) https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 266 PS15, Line 266: struct osmo_mslookup_query *q > Parameters need to be documented. [?] it must be a pointer to a caller allocated structure, there is no other way to use this function signature. But you shall have API comments. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 274 PS15, Line 274: *q = (struct osmo_mslookup_query){}; > So this is a fancy way to initialize a caller-allocated structure, right? [?] IMHO not fancy at all, it is the way to tell the compiler to zero initialize all struct members, which I use all the time. IMO memset() is a hack to work around not using a proper compiler directive. I explicitly want *q to be zero initialized also if parsing failed, as a second safeguard to not use random data. Granted, on some failure modes we return a partially populated struct ... but at least no random data that could cause buffer overflows. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c File src/mslookup/mslookup_client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c at 45 PS15, Line 45: struct > const this is a static function to find an entry, which may then be modified: no const. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c at 59 PS15, Line 59: talloc_zero > I would avoid zero-initialization here, because 2/3 fields are explicitly initialized below. [?] I use talloc_zero() by principle, and in my coding style I often fully initialize all members shortly after: I would rather initialize twice than introduce non-obvious missing initialization, e.g. if the struct grows more members in the future. It is unlikely to be any measurable performance impact. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client_fake.c File src/mslookup/mslookup_client_fake.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client_fake.c at 59 PS15, Line 59: talloc_zero > Zero-initialization is redundant here (see the next line). true and that's fine? https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client_fake.c at 136 PS15, Line 136: talloc_zero > same true and that's fine? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 17:45:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:46:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:46:24 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 to look at the new patch set (#20). Change subject: add libosmo-mslookup abstract client ...................................................................... add libosmo-mslookup abstract client mslookup is a key concept in Distributed GSM, which allows querying the current location of a subscriber in a number of cooperating but independent core network sites, by arbitrary service names and by MSISDN/IMSI. Add the abstract mslookup client library. An actual lookup method (besides mslookup_client_fake.c) is added in a subsequent patch. For a detailed overview of this and upcoming patches, please see the elaborate comment at the top of mslookup.c. Add as separate library, libosmo-mslookup, to allow adding D-GSM capability to arbitrary client programs. osmo-hlr will be the only mslookup server implementation, added in a subsequent patch. osmo-hlr itself will also use this library and act as an mslookup client, when requesting the home HLR for locally unknown IMSIs. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 --- M .gitignore M configure.ac M debian/control A debian/libosmo-mslookup-dev.install A debian/libosmo-mslookup0.install M include/Makefile.am M include/osmocom/hlr/logging.h A include/osmocom/mslookup/mslookup.h A include/osmocom/mslookup/mslookup_client.h A include/osmocom/mslookup/mslookup_client_fake.h A libosmo-mslookup.pc.in M src/Makefile.am M src/logging.c A src/mslookup/Makefile.am A src/mslookup/mslookup.c A src/mslookup/mslookup_client.c A src/mslookup/mslookup_client_fake.c M tests/Makefile.am A tests/mslookup/Makefile.am A tests/mslookup/mslookup_client_test.c A tests/mslookup/mslookup_client_test.err A tests/mslookup/mslookup_test.c A tests/mslookup/mslookup_test.err M tests/testsuite.at 24 files changed, 1,622 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/16202/20 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 17:50:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 17:50:36 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c File src/mslookup/mslookup_client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c at 45 PS15, Line 45: struct > this is a static function to find an entry, which may then be modified: no const. oh well, actually you're right that this function doesn't modify client->* itself, but it feels like the wrong indication to pass it as const. We often pass objects as non-const even though the particular function doesn't modify, in the sense of object oriented API. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 17:50:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 18:00:57 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jan 2020 18:00:57 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... Patch Set 21: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16203/19/src/mslookup/osmo-mslookup-client.c File src/mslookup/osmo-mslookup-client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16203/19/src/mslookup/osmo-mslookup-client.c at 61 PS19, Line 61: "\n" > it's fairy atypical for us to print such extensive help messages interactively. [?] do we have an autotools thing to install manpages? I'm a bit reluctant to introduce one for these few paragraphs (and I personally like verbose --help) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 18:00:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 6 20:48:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jan 2020 20:48:08 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... Patch Set 1: Is there some backtrace or logs which can help understand the code path? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jan 2020 20:48:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 6 22:58:51 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 22:58:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e13bbb8bdb0d_2d9c2b276ec9e60c72073f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 1211s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1211s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1211s] dh_install -O--fail-missing [ 1211s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 1211s] dh_install: This feature will be removed in compat 12. [ 1211s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 1211s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 1211s] dh_missing: missing files, aborting [ 1211s] The following debhelper tools have reported what they installed (with files per package) [ 1211s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 1211s] If the missing files are installed by another tool, please file a bug against it. [ 1211s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 1211s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 1211s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 1211s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 1211s] For a short-term work-around: Add the files to debian/not-installed [ 1211s] dh_install: dh_missing --fail-missing returned exit code 255 [ 1211s] make: *** [debian/rules:12: binary] Error 255 [ 1211s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1211s] [ 1211s] lamb22 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 22:58:43 UTC 2020. [ 1211s] [ 1211s] ### VM INTERACTION START ### [ 1215s] [ 1130.085443] sysrq: SysRq : Power Off [ 1215s] [ 1130.166117] reboot: Power down [ 1215s] ### VM INTERACTION END ### [ 1215s] [ 1215s] lamb22 failed "build osmo-remsim_0.2.2.dsc" at Mon Jan 6 22:58:47 UTC 2020. [ 1215s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 6 23:33:25 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jan 2020 23:33:25 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13c3cdad26a_2d9c2b276ec9e60c725984@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Testing/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 16s] querying package ids... [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] installing [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] exit ... [ 16s] [ 16s] build83 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 6 23:33:10 UTC 2020. [ 16s] [ 16s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 16s] ### VM INTERACTION START ### [ 20s] [ 6.641419] sysrq: SysRq : Power Off [ 20s] [ 6.644507] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] build83 failed "build eclipse-titan_6.5.0-1.dsc" at Mon Jan 6 23:33:14 UTC 2020. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:32:00 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:32:00 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13dfb08b7a3_2d9c2b276ec9e60c7356a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/osmocom-nightly_0.0.0.20200107.dsc ... [ 13s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-nightly_0.0.0.20200107.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] build78 failed "build osmocom-nightly_0.0.0.20200107.dsc" at Tue Jan 7 01:31:47 UTC 2020. [ 14s] [ 14s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 14s] ### VM INTERACTION START ### [ 17s] [ 6.405617] sysrq: SysRq : Power Off [ 17s] [ 6.410461] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] build78 failed "build osmocom-nightly_0.0.0.20200107.dsc" at Tue Jan 7 01:31:50 UTC 2020. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:36:00 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:36:00 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e0a2420fe_2d9c2b276ec9e60c736076@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libosmocore_1.3.0.4.424ea.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.3.0.4.424ea.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb18 failed "build libosmocore_1.3.0.4.424ea.dsc" at Tue Jan 7 01:35:56 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.879803] sysrq: SysRq : Power Off [ 23s] [ 7.890700] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb18 failed "build libosmocore_1.3.0.4.424ea.dsc" at Tue Jan 7 01:35:59 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:42:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:42:34 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e2256dd23_2d9c2b276ec9e60c73734f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-abis_0.8.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.8.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/245] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb09 failed "build libosmo-abis_0.8.0.dsc" at Tue Jan 7 01:42:17 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.661382] sysrq: SysRq : Power Off [ 22s] [ 7.668241] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb09 failed "build libosmo-abis_0.8.0.dsc" at Tue Jan 7 01:42:20 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:44:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:44:34 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e2a0ee161_2d9c2b276ec9e60c737788@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb53 failed "build libasn1c_0.9.32.dsc" at Tue Jan 7 01:44:14 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.807947] sysrq: SysRq : Power Off [ 25s] [ 8.828541] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb53 failed "build libasn1c_0.9.32.dsc" at Tue Jan 7 01:44:18 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:45:42 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:45:42 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e2da15a9d_2d9c2b276ec9e60c7378ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 63s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 63s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 63s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 63s] running base-passwd preinstall script [ 63s] running base-passwd postinstall script [ 63s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] running user-setup postinstall script [ 63s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 63s] running base-files postinstall script [ 64s] running gawk postinstall script [ 65s] querying package ids... [ 65s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 65s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 66s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 66s] installing [ 66s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 66s] exit ... [ 66s] [ 66s] lamb16 failed "build libsmpp34_1.14.0.dsc" at Tue Jan 7 01:45:28 UTC 2020. [ 66s] [ 66s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 66s] ### VM INTERACTION START ### [ 69s] [ 13.644239] sysrq: SysRq : Power Off [ 69s] [ 13.665673] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] lamb16 failed "build libsmpp34_1.14.0.dsc" at Tue Jan 7 01:45:32 UTC 2020. [ 69s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:50:00 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:50:00 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e3e7695f0_2d9c2b276ec9e60c7383bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-netif_0.7.0.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.7.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/253] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb06 failed "build libosmo-netif_0.7.0.dsc" at Tue Jan 7 01:49:49 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.902851] sysrq: SysRq : Power Off [ 22s] [ 7.912534] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb06 failed "build libosmo-netif_0.7.0.dsc" at Tue Jan 7 01:49:52 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:50:51 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:50:51 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e4081ef4_2d9c2b276ec9e60c73843@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.39.7f7d.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/241] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb08 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Tue Jan 7 01:50:40 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.551510] sysrq: SysRq : Power Off [ 23s] [ 7.559535] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb08 failed "build simtrace2_0.7.0.39.7f7d.dsc" at Tue Jan 7 01:50:43 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:55:08 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:55:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e51492be2_2d9c2b276ec9e60c7389a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.1.c2fb.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.3.0.1.c2fb.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/439] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb06 failed "build osmo-gsm-manuals-dev_0.3.0.1.c2fb.dsc" at Tue Jan 7 01:54:53 UTC 2020. [ 21s] [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.808984] sysrq: SysRq : Power Off [ 24s] [ 7.816387] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb06 failed "build osmo-gsm-manuals-dev_0.3.0.1.c2fb.dsc" at Tue Jan 7 01:54:56 UTC 2020. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 01:56:17 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 01:56:17 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e54e62595_2d9c2b276ec9e60c7390cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 18s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb12 failed "build libgtpnl_1.2.1.dsc" at Tue Jan 7 01:56:05 UTC 2020. [ 19s] [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.442404] sysrq: SysRq : Power Off [ 22s] [ 7.450547] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb12 failed "build libgtpnl_1.2.1.dsc" at Tue Jan 7 01:56:08 UTC 2020. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:00:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:00:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e65cdbde2_2d9c2b276ec9e60c7391f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-hlr_1.2.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.2.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 21s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/469] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb11 failed "build osmo-hlr_1.2.0.dsc" at Tue Jan 7 02:00:21 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 8.068346] sysrq: SysRq : Power Off [ 26s] [ 8.078561] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb11 failed "build osmo-hlr_1.2.0.dsc" at Tue Jan 7 02:00:25 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:01:08 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:01:08 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e67c66008_2d9c2b276ec9e60c739252@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 50s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] processing recipe /.build-srcdir/libosmo-sccp_1.2.0.dsc ... [ 50s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 50s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.2.0.dsc build ... [ 50s] running base-passwd preinstall script [ 50s] running base-passwd postinstall script [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] running user-setup postinstall script [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] running base-files postinstall script [ 50s] running gawk postinstall script [ 51s] querying package ids... [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] installing [ 51s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] exit ... [ 51s] [ 51s] cloud105 failed "build libosmo-sccp_1.2.0.dsc" at Tue Jan 7 02:00:54 UTC 2020. [ 51s] [ 51s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 51s] ### VM INTERACTION START ### [ 55s] [ 9.731793] sysrq: SysRq : Power Off [ 55s] [ 9.747090] reboot: Power down [ 55s] ### VM INTERACTION END ### [ 55s] [ 55s] cloud105 failed "build libosmo-sccp_1.2.0.dsc" at Tue Jan 7 02:00:58 UTC 2020. [ 55s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:05:42 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:05:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e78b78e0_2d9c2b276ec9e60c7393ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-mgw_1.7.0.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.7.0.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/458] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb17 failed "build osmo-mgw_1.7.0.dsc" at Tue Jan 7 02:05:35 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.010398] sysrq: SysRq : Power Off [ 25s] [ 8.016047] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb17 failed "build osmo-mgw_1.7.0.dsc" at Tue Jan 7 02:05:39 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:07:08 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:07:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e7e4bb6_2d9c2b276ec9e60c739476@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 30s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] processing recipe /.build-srcdir/osmo-iuh_0.6.0.dsc ... [ 30s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 30s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.6.0.dsc build ... [ 30s] running base-passwd preinstall script [ 30s] running base-passwd postinstall script [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] running user-setup postinstall script [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] running base-files postinstall script [ 30s] running gawk postinstall script [ 32s] querying package ids... [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] [1/251] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] installing [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] exit ... [ 33s] [ 33s] lamb23 failed "build osmo-iuh_0.6.0.dsc" at Tue Jan 7 02:06:56 UTC 2020. [ 33s] [ 33s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 33s] ### VM INTERACTION START ### [ 36s] [ 13.183171] sysrq: SysRq : Power Off [ 36s] [ 13.199531] reboot: Power down [ 36s] ### VM INTERACTION END ### [ 36s] [ 36s] lamb23 failed "build osmo-iuh_0.6.0.dsc" at Tue Jan 7 02:06:59 UTC 2020. [ 36s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:10:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:10:34 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e8b5689cf_2d9c2b276ec9e60c73963f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Testing/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb59 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Tue Jan 7 02:10:22 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 8.139532] sysrq: SysRq : Power Off [ 23s] [ 8.145143] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb59 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Tue Jan 7 02:10:25 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:10:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:10:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e8b5ea8c5_2d9c2b276ec9e60c73975c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] processing recipe /.build-srcdir/osmo-ggsn_1.5.0.dsc ... [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.5.0.dsc build ... [ 23s] running base-passwd preinstall script [ 23s] running base-passwd postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running user-setup postinstall script [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] running base-files postinstall script [ 23s] running gawk postinstall script [ 23s] querying package ids... [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] [1/465] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] installing [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] exit ... [ 24s] [ 24s] lamb18 failed "build osmo-ggsn_1.5.0.dsc" at Tue Jan 7 02:10:27 UTC 2020. [ 24s] [ 24s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 24s] ### VM INTERACTION START ### [ 27s] [ 7.862192] sysrq: SysRq : Power Off [ 27s] [ 7.868815] reboot: Power down [ 27s] ### VM INTERACTION END ### [ 27s] [ 27s] lamb18 failed "build osmo-ggsn_1.5.0.dsc" at Tue Jan 7 02:10:30 UTC 2020. [ 27s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:14:17 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:14:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13e9879d57a_2d9c2b276ec9e60c7401a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] processing recipe /.build-srcdir/osmo-python-tests_0.0.9.20200107.dsc ... [ 26s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 26s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-python-tests_0.0.9.20200107.dsc build ... [ 26s] running base-passwd preinstall script [ 26s] running base-passwd postinstall script [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] running user-setup postinstall script [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] running base-files postinstall script [ 26s] running gawk postinstall script [ 27s] querying package ids... [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] [1/208] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] installing [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] exit ... [ 27s] [ 27s] cloud129 failed "build osmo-python-tests_0.0.9.20200107.dsc" at Tue Jan 7 02:13:58 UTC 2020. [ 27s] [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] ### VM INTERACTION START ### [ 30s] [ 11.921532] sysrq: SysRq : Power Off [ 30s] [ 11.925922] reboot: Power down [ 31s] ### VM INTERACTION END ### [ 31s] [ 31s] cloud129 failed "build osmo-python-tests_0.0.9.20200107.dsc" at Tue Jan 7 02:14:02 UTC 2020. [ 31s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:18:01 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:18:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13ea5d65a9a_2d9c2b276ec9e60c740799@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb22 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Tue Jan 7 02:17:54 UTC 2020. [ 22s] [ 22s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 22s] ### VM INTERACTION START ### [ 25s] [ 8.933499] sysrq: SysRq : Power Off [ 25s] [ 8.941640] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb22 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Tue Jan 7 02:17:58 UTC 2020. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:21:42 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:21:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13eb4b22505_2d9c2b276ec9e60c741325@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 49s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] processing recipe /.build-srcdir/osmo-pcap_0.1.2.dsc ... [ 49s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 49s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.2.dsc build ... [ 49s] running base-passwd preinstall script [ 49s] running base-passwd postinstall script [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] running user-setup postinstall script [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] running base-files postinstall script [ 49s] running gawk postinstall script [ 50s] querying package ids... [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] installing [ 51s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] exit ... [ 51s] [ 51s] build82 failed "build osmo-pcap_0.1.2.dsc" at Tue Jan 7 02:21:35 UTC 2020. [ 51s] [ 51s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 51s] ### VM INTERACTION START ### [ 54s] [ 10.719715] sysrq: SysRq : Power Off [ 54s] [ 10.737766] reboot: Power down [ 54s] ### VM INTERACTION END ### [ 54s] [ 54s] build82 failed "build osmo-pcap_0.1.2.dsc" at Tue Jan 7 02:21:38 UTC 2020. [ 54s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:23:25 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:23:25 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13eba51d6c5_2d9c2b276ec9e60c741533@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 74s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 74s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 74s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 74s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 74s] running base-passwd preinstall script [ 74s] running base-passwd postinstall script [ 74s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 74s] running user-setup postinstall script [ 74s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 74s] running base-files postinstall script [ 75s] running gawk postinstall script [ 76s] querying package ids... [ 76s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 76s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 77s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 77s] installing [ 77s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 77s] exit ... [ 77s] [ 77s] lamb53 failed "build libosmodsp_0.4.0.dsc" at Tue Jan 7 02:23:20 UTC 2020. [ 77s] [ 77s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 77s] ### VM INTERACTION START ### [ 81s] [ 26.702990] sysrq: SysRq : Power Off [ 81s] [ 26.773019] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb53 failed "build libosmodsp_0.4.0.dsc" at Tue Jan 7 02:23:24 UTC 2020. [ 81s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:26:17 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:26:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13ec571e58a_2d9c2b276ec9e60c7419cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 57s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 57s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc ... [ 57s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 58s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc build ... [ 58s] running base-passwd preinstall script [ 58s] running base-passwd postinstall script [ 58s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 58s] running user-setup postinstall script [ 58s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 58s] running base-files postinstall script [ 58s] running gawk postinstall script [ 59s] querying package ids... [ 59s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 59s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] [1/215] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] installing [ 60s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] exit ... [ 60s] [ 60s] lamb61 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Tue Jan 7 02:26:12 UTC 2020. [ 60s] [ 60s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 60s] ### VM INTERACTION START ### [ 64s] [ 23.580648] sysrq: SysRq : Power Off [ 64s] [ 23.604563] reboot: Power down [ 64s] ### VM INTERACTION END ### [ 64s] [ 64s] lamb61 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Tue Jan 7 02:26:16 UTC 2020. [ 64s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:28:17 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:28:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13eccf9c1d8_2d9c2b276ec9e60c7421e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 59s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 59s] processing recipe /.build-srcdir/osmo-pcu_0.8.0.4.771d.dsc ... [ 59s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 59s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.8.0.4.771d.dsc build ... [ 59s] running base-passwd preinstall script [ 59s] running base-passwd postinstall script [ 59s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 59s] running user-setup postinstall script [ 59s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 59s] running base-files postinstall script [ 59s] running gawk postinstall script [ 60s] querying package ids... [ 60s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] [1/457] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] installing [ 60s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 60s] exit ... [ 60s] [ 60s] cloud128 failed "build osmo-pcu_0.8.0.4.771d.dsc" at Tue Jan 7 02:27:57 UTC 2020. [ 60s] [ 60s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 60s] ### VM INTERACTION START ### [ 63s] [ 8.433574] sysrq: SysRq : Power Off [ 63s] [ 8.453235] reboot: Power down [ 63s] ### VM INTERACTION END ### [ 63s] [ 63s] cloud128 failed "build osmo-pcu_0.8.0.4.771d.dsc" at Tue Jan 7 02:28:01 UTC 2020. [ 63s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:32:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:32:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13ede0b4d83_2d9c2b276ec9e60c7425a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 50s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] processing recipe /.build-srcdir/osmo-bts_1.2.0.1.b54f.dsc ... [ 50s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 50s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.2.0.1.b54f.dsc build ... [ 50s] running base-passwd preinstall script [ 50s] running base-passwd postinstall script [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] running user-setup postinstall script [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] running base-files postinstall script [ 50s] running gawk postinstall script [ 50s] querying package ids... [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 50s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] [1/468] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] installing [ 51s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] exit ... [ 51s] [ 51s] cloud125 failed "build osmo-bts_1.2.0.1.b54f.dsc" at Tue Jan 7 02:32:29 UTC 2020. [ 51s] [ 51s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 51s] ### VM INTERACTION START ### [ 54s] [ 8.251215] sysrq: SysRq : Power Off [ 54s] [ 8.264401] reboot: Power down [ 54s] ### VM INTERACTION END ### [ 54s] [ 54s] cloud125 failed "build osmo-bts_1.2.0.1.b54f.dsc" at Tue Jan 7 02:32:33 UTC 2020. [ 54s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:35:25 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13ee75465ea_2d9c2b276ec9e60c7432ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 54s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 54s] processing recipe /.build-srcdir/osmo-sip-connector_1.4.0.dsc ... [ 54s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 54s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.4.0.dsc build ... [ 54s] running base-passwd preinstall script [ 54s] running base-passwd postinstall script [ 54s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 54s] running user-setup postinstall script [ 54s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 54s] running base-files postinstall script [ 54s] running gawk postinstall script [ 55s] querying package ids... [ 55s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 55s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 56s] [1/482] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 56s] installing [ 56s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 56s] exit ... [ 56s] [ 56s] cloud111 failed "build osmo-sip-connector_1.4.0.dsc" at Tue Jan 7 02:35:17 UTC 2020. [ 56s] [ 56s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 56s] ### VM INTERACTION START ### [ 59s] [ 12.842600] sysrq: SysRq : Power Off [ 59s] [ 12.848384] reboot: Power down [ 59s] ### VM INTERACTION END ### [ 59s] [ 59s] cloud111 failed "build osmo-sip-connector_1.4.0.dsc" at Tue Jan 7 02:35:21 UTC 2020. [ 59s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:39:25 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:39:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13ef648f7df_2d9c2b276ec9e60c74361@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 25s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc ... [ 25s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 25s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.28.25bc.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/513] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] exit ... [ 27s] [ 27s] lamb51 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Tue Jan 7 02:39:16 UTC 2020. [ 27s] [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] ### VM INTERACTION START ### [ 30s] [ 9.100180] sysrq: SysRq : Power Off [ 30s] [ 9.115605] reboot: Power down [ 30s] ### VM INTERACTION END ### [ 30s] [ 30s] lamb51 failed "build osmo-remsim_0.2.2.28.25bc.dsc" at Tue Jan 7 02:39:20 UTC 2020. [ 30s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:41:08 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:41:08 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13efdd312bb_2d9c2b276ec9e60c7438a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Testing/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 35s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] processing recipe /.build-srcdir/openbsc_1.3.2.20200107.dsc ... [ 35s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 35s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.2.20200107.dsc build ... [ 36s] running base-passwd preinstall script [ 36s] running base-passwd postinstall script [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] running user-setup postinstall script [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] running base-files postinstall script [ 36s] running gawk postinstall script [ 36s] querying package ids... [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] [1/231] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] installing [ 37s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] exit ... [ 37s] [ 37s] cloud111 failed "build openbsc_1.3.2.20200107.dsc" at Tue Jan 7 02:40:48 UTC 2020. [ 37s] [ 37s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 37s] ### VM INTERACTION START ### [ 40s] [ 9.779664] sysrq: SysRq : Power Off [ 40s] [ 9.796963] reboot: Power down [ 40s] ### VM INTERACTION END ### [ 40s] [ 40s] cloud111 failed "build openbsc_1.3.2.20200107.dsc" at Tue Jan 7 02:40:52 UTC 2020. [ 40s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:44:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:44:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13f0ae1ca12_2d9c2b276ec9e60c744037@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] processing recipe /.build-srcdir/osmo-bsc_1.6.0.1.35d07.dsc ... [ 27s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 27s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.6.0.1.35d07.dsc build ... [ 27s] running base-passwd preinstall script [ 27s] running base-passwd postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running user-setup postinstall script [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] running base-files postinstall script [ 27s] running gawk postinstall script [ 27s] querying package ids... [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] [1/474] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] installing [ 28s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] exit ... [ 28s] [ 28s] build31 failed "build osmo-bsc_1.6.0.1.35d07.dsc" at Tue Jan 7 02:44:23 UTC 2020. [ 28s] [ 28s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 28s] ### VM INTERACTION START ### [ 31s] [ 8.337944] sysrq: SysRq : Power Off [ 31s] [ 8.341825] reboot: Power down [ 31s] ### VM INTERACTION END ### [ 31s] [ 31s] build31 failed "build osmo-bsc_1.6.0.1.35d07.dsc" at Tue Jan 7 02:44:27 UTC 2020. [ 31s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:46:34 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:46:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13f12638cd6_2d9c2b276ec9e60c744497@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-msc_1.6.0.3.02dd2.dsc ... [ 19s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.6.0.3.02dd2.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/483] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] build83 failed "build osmo-msc_1.6.0.3.02dd2.dsc" at Tue Jan 7 02:46:16 UTC 2020. [ 20s] [ 20s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.624143] sysrq: SysRq : Power Off [ 23s] [ 7.629950] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] build83 failed "build osmo-msc_1.6.0.3.02dd2.dsc" at Tue Jan 7 02:46:20 UTC 2020. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 02:50:17 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 02:50:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e13f1f624035_2d9c2b276ec9e60c74468e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-sgsn_1.6.0.dsc ... [ 21s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.6.0.dsc build ... [ 21s] running base-passwd preinstall script [ 21s] running base-passwd postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running user-setup postinstall script [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] [1/480] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] installing [ 23s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb56 failed "build osmo-sgsn_1.6.0.dsc" at Tue Jan 7 02:50:06 UTC 2020. [ 23s] [ 23s] grep: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.834646] sysrq: SysRq : Power Off [ 26s] [ 7.842885] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb56 failed "build osmo-sgsn_1.6.0.dsc" at Tue Jan 7 02:50:10 UTC 2020. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jan 7 10:47:14 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 10:47:14 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1461ba913eb_49992ae64020460c13086@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 392s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 392s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 392s] dh_install -O--fail-missing [ 392s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 392s] dh_install: This feature will be removed in compat 12. [ 392s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 392s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 392s] dh_missing: missing files, aborting [ 392s] The following debhelper tools have reported what they installed (with files per package) [ 392s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 392s] If the missing files are installed by another tool, please file a bug against it. [ 392s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 392s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 392s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 392s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 392s] For a short-term work-around: Add the files to debian/not-installed [ 392s] dh_install: dh_missing --fail-missing returned exit code 255 [ 392s] make: *** [debian/rules:12: binary] Error 255 [ 392s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 392s] [ 392s] lamb07 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 10:47:01 UTC 2020. [ 392s] [ 392s] ### VM INTERACTION START ### [ 396s] [ 377.658518] sysrq: SysRq : Power Off [ 396s] [ 377.663923] reboot: Power down [ 396s] ### VM INTERACTION END ### [ 396s] [ 396s] lamb07 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 10:47:05 UTC 2020. [ 396s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 7 11:01:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 11:01:53 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Fix recent commit breaking tests References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16747 ) Change subject: ttcn3-stp: Fix recent commit breaking tests ...................................................................... ttcn3-stp: Fix recent commit breaking tests Recent test aiming at dropping different cfg file for latest also dropped the cp of the regular cfg file. Let's re-add it. Fixes: 0f34d3749192b12f8eb9ec678c5c834c6d599c4e Change-Id: Ia79e5b50978ed09ce4d0a5a286770e867657ad3e --- M ttcn3-stp-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/16747/1 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 939dc36..7bb0337 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,6 +12,7 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ network_create 172.18.19.0/24 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia79e5b50978ed09ce4d0a5a286770e867657ad3e Gerrit-Change-Number: 16747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 11:02:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 11:02:19 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Fix recent commit breaking tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16747 ) Change subject: ttcn3-stp: Fix recent commit breaking tests ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia79e5b50978ed09ce4d0a5a286770e867657ad3e Gerrit-Change-Number: 16747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 11:02:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 11:02:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 11:02:22 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Fix recent commit breaking tests In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16747 ) Change subject: ttcn3-stp: Fix recent commit breaking tests ...................................................................... ttcn3-stp: Fix recent commit breaking tests Recent test aiming at dropping different cfg file for latest also dropped the cp of the regular cfg file. Let's re-add it. Fixes: 0f34d3749192b12f8eb9ec678c5c834c6d599c4e Change-Id: Ia79e5b50978ed09ce4d0a5a286770e867657ad3e --- M ttcn3-stp-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 939dc36..7bb0337 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,6 +12,7 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ network_create 172.18.19.0/24 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia79e5b50978ed09ce4d0a5a286770e867657ad3e Gerrit-Change-Number: 16747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 11:04:53 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jan 2020 11:04:53 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15888 to look at the new patch set (#7). Change subject: l1sap: add measurement related struct members ...................................................................... l1sap: add measurement related struct members In order to dissolve info_meas_ind_param in ph_data_param and ph_tch_param we need to add the measurement related struct members to ph_data_param and ph_tch_param as well so that those indications can also carry measurement data. Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Related: OS#2977 --- M TODO-RELEASE M include/osmocom/gsm/l1sap.h 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/15888/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 11:12:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 11:12:14 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 11:12:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jan 7 11:14:23 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 11:14:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e14682934386_49992ae64020460c143890@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 445s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 445s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 445s] dh_install -O--fail-missing [ 445s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 445s] dh_install: This feature will be removed in compat 12. [ 445s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 445s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 445s] dh_missing: missing files, aborting [ 445s] The following debhelper tools have reported what they installed (with files per package) [ 445s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 445s] If the missing files are installed by another tool, please file a bug against it. [ 445s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 445s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 445s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 445s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 445s] For a short-term work-around: Add the files to debian/not-installed [ 445s] dh_install: dh_missing --fail-missing returned exit code 255 [ 445s] make: *** [debian/rules:12: binary] Error 255 [ 445s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 445s] [ 445s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 11:14:07 UTC 2020. [ 445s] [ 445s] ### VM INTERACTION START ### [ 448s] [ 429.997207] sysrq: SysRq : Power Off [ 448s] [ 430.006395] reboot: Power down [ 448s] ### VM INTERACTION END ### [ 448s] [ 448s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 11:14:10 UTC 2020. [ 448s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 7 12:18:49 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 7 Jan 2020 12:18:49 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/16748 ) Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts ...................................................................... ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa --- M ttcn3/ttcn3.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/48/16748/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 5322182..f9297b7 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -131,7 +131,15 @@ echo "osmo-ttcn3-hacks" echo "osmocom-bb") > ttcn3/3G+2G_ttcn3.deps - ./gen_makefile.py ttcn3/3G+2G_ttcn3.deps default.opts iu.opts no_systemd.opts ttcn3/ttcn3.opts -I -m "$DIR_MAKE" + ./gen_makefile.py \ + ttcn3/3G+2G_ttcn3.deps \ + default.opts \ + iu.opts \ + no_systemd.opts \ + no_doxygen.opts \ + no_dahdi.opts \ + no_optimization.opts \ + ttcn3/ttcn3.opts -I -m "$DIR_MAKE" } # $1: name of repository (e.g. osmo-ttcn3-hacks) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa Gerrit-Change-Number: 16748 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 12:20:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 7 Jan 2020 12:20:08 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/16748 ) Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts ...................................................................... Patch Set 1: Verified+1 Code-Review+2 Trivial patch for ttcn3.sh, as Neels said I can merge those without additional review. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa Gerrit-Change-Number: 16748 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 12:20:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 12:20:15 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 7 Jan 2020 12:20:15 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/16748 ) Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts ...................................................................... ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa --- M ttcn3/ttcn3.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 5322182..f9297b7 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -131,7 +131,15 @@ echo "osmo-ttcn3-hacks" echo "osmocom-bb") > ttcn3/3G+2G_ttcn3.deps - ./gen_makefile.py ttcn3/3G+2G_ttcn3.deps default.opts iu.opts no_systemd.opts ttcn3/ttcn3.opts -I -m "$DIR_MAKE" + ./gen_makefile.py \ + ttcn3/3G+2G_ttcn3.deps \ + default.opts \ + iu.opts \ + no_systemd.opts \ + no_doxygen.opts \ + no_dahdi.opts \ + no_optimization.opts \ + ttcn3/ttcn3.opts -I -m "$DIR_MAKE" } # $1: name of repository (e.g. osmo-ttcn3-hacks) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa Gerrit-Change-Number: 16748 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 12:54:59 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jan 2020 12:54:59 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#7). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 122 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:21 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support ...................................................................... libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/52/16752/1 diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index e5b34ae..40a42bc 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,11 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls lksctp-tools" +DEPENDS = "libtalloc" PACKAGECONFIG ??= "\ + gnutls \ libusb \ + libsctp \ " +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:19 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Update Osmocom recipes to latest tags (release 202001) Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be --- M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 14 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/16749/1 diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index e64ace2..0582599 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46" +SRCREV = "c313d44272f04b24dad38f4caea17180f9cbc509" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.7.0+gitr${SRCPV}" +PV = "0.8.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 23a0148..c52c7e9 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757" +SRCREV = "b8121e79ef53b30df535fb38987b3a48853ebbe9" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +PV = "0.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 6204aab..31fa234 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b" +SRCREV = "5e4643f4bc76a1437621348550b5b2a603e2179b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index f43f296..d5eab3a 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" +SRCREV = "2862f9082ed4f16383a134e1112610d76ad91bf0" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.2.0+gitr${SRCPV}" -PR = "${INC_PR}.1" +PV = "1.3.0+gitr${SRCPV}" +PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index c9b75e8..98318a4 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.3.1+gitr${SRCPV}" +PV = "1.3.2+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c" +SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 19be0e5..fdb389b 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d" +SRCREV = "a1362ce8c20b2fa60e3da67936ea69d406e23aff" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 939fc58..b1b2298 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2" +SRCREV = "e71e0f2af84d8b26f4c09a8c859f86cf701b3357" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://libgtp-queue_depth_32.patch \ " -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 2a5d842..90bb611 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "9cf0030b6a8e41fbcfec6cedb5f6c2c5871d7931" +SRCREV = "3a66698d87b29e0bf8eb53ca29db7e0f02871abc" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 2d1beba..66efd8c 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "505fa9eae765a31289e3a1743f606e83b9cd65d0" +SRCREV = "67d32a0386b1c0bfb7a12f63b5bb475a08010e80" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.5.0+gitr${SRCPV}" +PV = "0.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 3b8d37d..14dd5c1 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "50e52e45f9c01d5799520ddb53565b868729801f" +SRCREV = "ec45068972b85c6ace5483c5f533dae8e7975d41" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index c3681ad..2f11b66 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0218814c8c099d6e9e6ba1e85f8d0d6672a32214" +SRCREV = "6a0c4d9d24f7a591018898459b8767c6d1447309" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index 2e2ca55..dd25b50 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "5e10f1db125cf869c5f1769df9abdd6084679b3e" +SRCREV = "d8368cebf8ca159c38027e4cb9109f9f0bcd0a46" SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.1+gitr${SRCPV}" +PV = "0.1.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index fe22de5..f0aa365 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d7ef94c0bb48797cb53947773c9e59ccdedc72bb" +SRCREV = "394aa533e9e3a744dfe10c2cf01898dabb8d6812" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index ec679c5..5d525ae 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f56af15181afdeeb9b517c589b7a220820b0083b" +SRCREV = "e58ead7ac4c0e97f82ceef828b8da30f7cb84927" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:21 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS ...................................................................... libosmocore: Add libusb to DEPENDS In I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3, libosmocore got libusb integration support, and since then libusb is a dependency (which can be disabled through --disable-libusb). Related: OS#4299 Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/16751/1 diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 5b21196..e5b34ae 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,10 +2,15 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libtalloc gnutls lksctp-tools" +PACKAGECONFIG ??= "\ + libusb \ + " +PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," + inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:20 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools ...................................................................... libosmocore: Add new dependency lksctp-tools Since commit 3f464fc007ace5a829e8d43e72a88055f14b52e3, libosmocore depends on libsctp to have osmo_sock_init2_multiaddr() API available. libosmo-netif.inc recipe already had the lksctp-tools dependency and hence was expecting libosmocore to also provide this API. By adding lksctp-tools to libosmocore dependencies, libsctp is available in sysroot and configure enables support for the API. Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/50/16750/1 diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 6077ff5..5b21196 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,10 +2,10 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls" +DEPENDS = "libtalloc gnutls lksctp-tools" inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:48 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:52 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:36:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:36:57 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:37:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:37:01 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:37:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:37:07 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 13:37:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 13:37:11 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 15:21:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 15:21:50 +0000 Subject: Change in osmo-trx[master]: lms: Move initialization of field started to constructor References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16753 ) Change subject: lms: Move initialization of field started to constructor ...................................................................... lms: Move initialization of field started to constructor Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/53/16753/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 19fe6e8..4a687e1 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -49,7 +49,7 @@ const std::vector& tx_paths, const std::vector& rx_paths): RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), - m_lms_dev(NULL) + m_lms_dev(NULL), started(false) { LOGC(DDEV, INFO) << "creating LMS device..."; @@ -248,8 +248,6 @@ for (size_t i = 0; i < rx_buffers.size(); i++) rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); - started = false; - return NORMAL; out_close: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad Gerrit-Change-Number: 16753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 15:21:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 15:21:50 +0000 Subject: Change in osmo-trx[master]: lms: Drop unused define References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define ...................................................................... lms: Drop unused define Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/54/16754/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 4a687e1..b8893fb 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -39,7 +39,6 @@ using namespace std; #define MAX_ANTENNA_LIST_SIZE 10 -#define LMS_SAMPLE_RATE GSMRATE*32 #define GSM_CARRIER_BW 270000.0 /* 270kHz */ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:11 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:16 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:21 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:29 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:33 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001) In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) ...................................................................... Update Osmocom recipes to latest tags (release 202001) Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be --- M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 14 files changed, 29 insertions(+), 29 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index e64ace2..0582599 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46" +SRCREV = "c313d44272f04b24dad38f4caea17180f9cbc509" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.7.0+gitr${SRCPV}" +PV = "0.8.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 23a0148..c52c7e9 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757" +SRCREV = "b8121e79ef53b30df535fb38987b3a48853ebbe9" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +PV = "0.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 6204aab..31fa234 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b" +SRCREV = "5e4643f4bc76a1437621348550b5b2a603e2179b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index f43f296..d5eab3a 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e" +SRCREV = "2862f9082ed4f16383a134e1112610d76ad91bf0" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.2.0+gitr${SRCPV}" -PR = "${INC_PR}.1" +PV = "1.3.0+gitr${SRCPV}" +PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index c9b75e8..98318a4 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.3.1+gitr${SRCPV}" +PV = "1.3.2+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c" +SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 19be0e5..fdb389b 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d" +SRCREV = "a1362ce8c20b2fa60e3da67936ea69d406e23aff" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 939fc58..b1b2298 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2" +SRCREV = "e71e0f2af84d8b26f4c09a8c859f86cf701b3357" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://libgtp-queue_depth_32.patch \ " -PV = "1.4.0+gitr${SRCPV}" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 2a5d842..90bb611 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "9cf0030b6a8e41fbcfec6cedb5f6c2c5871d7931" +SRCREV = "3a66698d87b29e0bf8eb53ca29db7e0f02871abc" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 2d1beba..66efd8c 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "505fa9eae765a31289e3a1743f606e83b9cd65d0" +SRCREV = "67d32a0386b1c0bfb7a12f63b5bb475a08010e80" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.5.0+gitr${SRCPV}" +PV = "0.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 3b8d37d..14dd5c1 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "50e52e45f9c01d5799520ddb53565b868729801f" +SRCREV = "ec45068972b85c6ace5483c5f533dae8e7975d41" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index c3681ad..2f11b66 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0218814c8c099d6e9e6ba1e85f8d0d6672a32214" +SRCREV = "6a0c4d9d24f7a591018898459b8767c6d1447309" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index 2e2ca55..dd25b50 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "5e10f1db125cf869c5f1769df9abdd6084679b3e" +SRCREV = "d8368cebf8ca159c38027e4cb9109f9f0bcd0a46" SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.1+gitr${SRCPV}" +PV = "0.1.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index fe22de5..f0aa365 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d7ef94c0bb48797cb53947773c9e59ccdedc72bb" +SRCREV = "394aa533e9e3a744dfe10c2cf01898dabb8d6812" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.6.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index ec679c5..5d525ae 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f56af15181afdeeb9b517c589b7a220820b0083b" +SRCREV = "e58ead7ac4c0e97f82ceef828b8da30f7cb84927" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:34 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools ...................................................................... libosmocore: Add new dependency lksctp-tools Since commit 3f464fc007ace5a829e8d43e72a88055f14b52e3, libosmocore depends on libsctp to have osmo_sock_init2_multiaddr() API available. libosmo-netif.inc recipe already had the lksctp-tools dependency and hence was expecting libosmocore to also provide this API. By adding lksctp-tools to libosmocore dependencies, libsctp is available in sysroot and configure enables support for the API. Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 6077ff5..5b21196 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,10 +2,10 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls" +DEPENDS = "libtalloc gnutls lksctp-tools" inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:34 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS ...................................................................... libosmocore: Add libusb to DEPENDS In I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3, libosmocore got libusb integration support, and since then libusb is a dependency (which can be disabled through --disable-libusb). Related: OS#4299 Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 5b21196..e5b34ae 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,10 +2,15 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libtalloc gnutls lksctp-tools" +PACKAGECONFIG ??= "\ + libusb \ + " +PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," + inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:21:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 16:21:35 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support ...................................................................... libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index e5b34ae..40a42bc 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,11 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls lksctp-tools" +DEPENDS = "libtalloc" PACKAGECONFIG ??= "\ + gnutls \ libusb \ + libsctp \ " +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:26:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:26:48 +0000 Subject: Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST ...................................................................... add crcXXgen.c.tpl to EXTRA_DIST 'make distcheck' distributes the generated .c files, but it is good GPL practice to also distribute the template. Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 --- M Makefile.am M src/Makefile.am 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/16755/1 diff --git a/Makefile.am b/Makefile.am index 7390f98..d08f41b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \ $(top_srcdir)/include/osmocom/core/*.h \ $(top_srcdir)/src/*.[hc] \ + $(top_srcdir)/src/crcXXgen.c.tpl \ $(top_srcdir)/src/pseudotalloc/*.[hc] rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core rm -rf $(top_builddir)/doc/libosmocore.map diff --git a/src/Makefile.am b/src/Makefile.am index 34cda0f..16119d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ endif BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c -EXTRA_DIST = conv_acc_sse_impl.h +EXTRA_DIST = conv_acc_sse_impl.h crcXXgen.c.tpl libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:46:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:46:39 +0000 Subject: Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_... References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16756 ) Change subject: jenkins.sh: simpler invocation of verify_value_string_... ...................................................................... jenkins.sh: simpler invocation of verify_value_string_... The script osmo-ci/scripts/verify_value_string_arrays_are_terminated.py is able to find .c/.h files in directory trees by itself. Shorten the cmdline invocation of this script for libosmocore. Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 --- M contrib/jenkins_common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/16756/1 diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index fa1d544..b86a479 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -10,7 +10,7 @@ osmo-clean-workspace.sh -verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") +verify_value_string_arrays_are_terminated.py prep_build() { _src_dir="$1" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 Gerrit-Change-Number: 16756 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:50:05 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:50:05 +0000 Subject: Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py) References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16757 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 --- M src/e1_input.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/57/16757/1 diff --git a/src/e1_input.c b/src/e1_input.c index eb973ef..9e2f7b0 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #define NUM_E1_TS 32 @@ -115,12 +116,19 @@ } __attribute__((packed)); struct lapd_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ea1 : 1; uint8_t cr : 1; uint8_t sapi : 6; uint8_t ea2 : 1; uint8_t tei : 7; uint8_t control_foo; /* fake UM's ... */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t sapi:6, cr:1, ea1:1; + uint8_t tei:7, ea2:1; + uint8_t control_foo; +#endif } __attribute__((packed)); osmo_static_assert(offsetof(struct fake_linux_lapd_header, hatype) == 2, hatype_offset); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 Gerrit-Change-Number: 16757 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:53:13 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:53:13 +0000 Subject: Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part ...................................................................... struct amr_header: copy comments to little endian part I will soon apply struct_endianess.py to this code, and then the comments that are now only in the big endian part would be lost. Copy them to preserve them. Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a --- M include/osmocom/netif/amr.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/58/16758/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 46ec86a..729d0ae 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -55,12 +55,12 @@ #elif OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, - cmr:4; + cmr:4; /* Codec Mode Request */ /* Table of Contents */ uint8_t pad2:2, - q:1, - ft:4, - f:1; + q:1, /* OK (not damaged) at origin? */ + ft:4, /* coding mode */ + f:1; /* followed by another speech frame? */ #endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:53:13 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:53:13 +0000 Subject: Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py) References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 --- M include/osmocom/netif/amr.h M include/osmocom/netif/osmux.h M include/osmocom/netif/rtp.h 3 files changed, 16 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/59/16759/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 729d0ae..6e37c99 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -43,16 +43,7 @@ */ struct amr_hdr { -#if OSMO_IS_BIG_ENDIAN - /* Payload Header */ - uint8_t cmr:4, /* Codec Mode Request */ - pad1:4; - /* Table of Contents */ - uint8_t f:1, /* followed by another speech frame? */ - ft:4, /* coding mode */ - q:1, /* OK (not damaged) at origin? */ - pad2:2; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, cmr:4; /* Codec Mode Request */ @@ -61,6 +52,10 @@ q:1, /* OK (not damaged) at origin? */ ft:4, /* coding mode */ f:1; /* followed by another speech frame? */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cmr:4, pad1:4; + uint8_t f:1, ft:4, q:1, pad2:2; #endif } __attribute__((packed)); diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 7dee438..6305dc8 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -30,28 +30,25 @@ #define OSMUX_FT_DUMMY 2 struct osmux_hdr { -#if OSMO_IS_BIG_ENDIAN - uint8_t rtp_m:1, - ft:2, - ctr:3, - amr_f:1, - amr_q:1; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN uint8_t amr_q:1, amr_f:1, ctr:3, ft:2, rtp_m:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t rtp_m:1, ft:2, ctr:3, amr_f:1, amr_q:1; #endif uint8_t seq; #define OSMUX_CID_MAX 255 /* determined by circuit_id */ uint8_t circuit_id; -#if OSMO_IS_BIG_ENDIAN - uint8_t amr_ft:4, - amr_cmr:4; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN uint8_t amr_cmr:4, amr_ft:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t amr_ft:4, amr_cmr:4; #endif } __attribute__((packed)); diff --git a/include/osmocom/netif/rtp.h b/include/osmocom/netif/rtp.h index c01df41..4e40745 100644 --- a/include/osmocom/netif/rtp.h +++ b/include/osmocom/netif/rtp.h @@ -13,12 +13,9 @@ uint8_t payload_type:7, marker:1; #elif OSMO_IS_BIG_ENDIAN - uint8_t version:2, - padding:1, - extension:1, - csrc_count:4; - uint8_t marker:1, - payload_type:7; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t version:2, padding:1, extension:1, csrc_count:4; + uint8_t marker:1, payload_type:7; #endif uint16_t sequence; uint32_t timestamp; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 16:54:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 16:54:27 +0000 Subject: Change in libosmo-netif[master]: configure: check for sctp.h References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h ...................................................................... configure: check for sctp.h Notice missing sctp header at configure time. Without this patch, the user only finds out at build time. Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/16760/1 diff --git a/configure.ac b/configure.ac index 7af10ec..56fc4d5 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ ], [ AC_MSG_ERROR([sctp_send not found in searched libs])]) LIBS=$old_LIBS +AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found)) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 17:04:49 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 17:04:49 +0000 Subject: Change in libosmo-sccp[master]: add/clean big-endian packed structs (struct_endianess.py) References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd --- M include/osmocom/mtp/mtp_level3.h M include/osmocom/sccp/sccp_types.h 2 files changed, 14 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/16761/1 diff --git a/include/osmocom/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h index d0d24a1..414b144 100644 --- a/include/osmocom/mtp/mtp_level3.h +++ b/include/osmocom/mtp/mtp_level3.h @@ -131,9 +131,8 @@ spare : 2, ni : 2; #elif OSMO_IS_BIG_ENDIAN - uint8_t ni : 2, - spare : 2, - ser_ind : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ni:2, spare:2, ser_ind:4; #endif uint32_t addr; uint8_t data[0]; @@ -144,8 +143,8 @@ uint8_t h0 : 4, h1 : 4; #elif OSMO_IS_BIG_ENDIAN - uint8_t h1 : 4, - h0 : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t h1:4, h0:4; #endif } __attribute__((packed)); @@ -155,8 +154,8 @@ uint8_t spare : 4, length : 4; #elif OSMO_IS_BIG_ENDIAN - uint8_t length : 4, - spare : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t length:4, spare:4; #endif uint8_t data[0]; } __attribute__((packed)); @@ -175,8 +174,8 @@ uint8_t mul_ind : 2, spare : 6; #elif OSMO_IS_BIG_ENDIAN - uint8_t spare : 6, - mul_ind : 2; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:6, mul_ind:2; #endif } __attribute__((packed)); diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 18b54f4..17c60e4 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -97,11 +97,8 @@ routing_indicator : 1, reserved : 1; #elif OSMO_IS_BIG_ENDIAN - uint8_t reserved : 1, - routing_indicator : 1, - global_title_indicator : 4, - ssn_indicator : 1, - point_code_indicator : 1; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:1, routing_indicator:1, global_title_indicator:4, ssn_indicator:1, point_code_indicator:1; #endif uint8_t data[0]; } __attribute__((packed)); @@ -115,8 +112,8 @@ uint8_t msb : 6, reserved : 2; #elif OSMO_IS_BIG_ENDIAN - uint8_t reserved : 2, - msb : 6; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:2, msb:6; #endif } __attribute__((packed)); @@ -157,8 +154,8 @@ uint8_t nature_of_addr_ind : 7, odd_even : 1; #elif OSMO_IS_BIG_ENDIAN - uint8_t odd_even : 1, - nature_of_addr_ind : 7; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t odd_even:1, nature_of_addr_ind:7; #endif uint8_t data[0]; } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd Gerrit-Change-Number: 16761 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 17:23:30 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 17:23:30 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... Patch Set 3: I still have this patch but not sure how to test: get a memleak and then verify that the patch fixes that (and not sure whether time should be spent) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 07 Jan 2020 17:23:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 17:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 17:41:05 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c at 1415 PS3, Line 1415: sccp_scrc_rx_scoc_conn_msg(inst, xua); why is this function called _rx_ and not _tx_ ? It's confusing. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:41:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 17:44:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 17:44:13 +0000 Subject: Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 1: I don't see the point of these patches. The structs are already correctly supporting both little endian and big endian, so running the script in this case is simply making them harder to read? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 17:52:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jan 2020 17:52:08 +0000 Subject: Change in libosmo-netif[master]: configure: check for sctp.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmo-netif/+/16760/1/configure.ac File configure.ac: https://gerrit.osmocom.org/c/libosmo-netif/+/16760/1/configure.ac at 100 PS1, Line 100: AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found)) Support check for libsctp here is wrong actually. Same for DAHDI probably. We should have explicit build enable/disable flags for those instead, and the header should only be checked in the event --enable-libsctp is passed (the default). See libosmocore (libsctp) and libosmo-abis(dahdi) as an example: --disable-libsctp Do not enable socket multiaddr APIs requiring libsctp AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"], [ old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_bindx], [sctp], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) AC_SUBST(HAVE_LIBSCTP, [1]) if test -n "$ac_lib"; then AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) fi ], [ AC_MSG_ERROR([sctp_bindx not found in searched libs])]) LIBS=$old_LIBS ]) AC_ARG_ENABLE([dahdi], AC_HELP_STRING([--disable-dahdi], [disable support for DAHID ISDN (E1/T1) cards [default=yes]]), [enable_dahdi="$enableval"], [enable_dahdi="yes"]) AM_CONDITIONAL(ENABLE_DAHDI, test "x$enable_dahdi" = "xyes") if test "x$enable_dahdi" = "xyes"; then AC_CHECK_HEADERS([dahdi/user.h],[],[AC_MSG_ERROR([DAHDI input driver enabled but DAHDI not found])]) else AC_MSG_WARN([DAHDI input driver will not be built]) fi -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:52:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:11:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:11:24 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#14). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/test_nodes.vty 19 files changed, 1,914 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:11:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:11:26 +0000 Subject: Change in osmo-hlr[master]: proxy routing refactor References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16762 ) Change subject: proxy routing refactor ...................................................................... proxy routing refactor Change-Id: I43ad27f6d768df02abb3459ac4c43bb80cc1cbeb --- M include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/mslookup_server.h M include/osmocom/hlr/proxy.h M include/osmocom/hlr/remote_hlr.h M src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/mslookup_server.c M src/proxy.c M src/remote_hlr.c M tests/gsup_server/Makefile.am 13 files changed, 297 insertions(+), 208 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/62/16762/1 diff --git a/include/osmocom/hlr/dgsm.h b/include/osmocom/hlr/dgsm.h index f06e381..b3d73e9 100644 --- a/include/osmocom/hlr/dgsm.h +++ b/include/osmocom/hlr/dgsm.h @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h index b7cfb89..22c9a10 100644 --- a/include/osmocom/hlr/gsup_server.h +++ b/include/osmocom/hlr/gsup_server.h @@ -74,3 +74,5 @@ uint8_t *msisdn_enc, size_t msisdn_enc_size, uint8_t *apn_buf, size_t apn_buf_size, enum osmo_gsup_cn_domain cn_domain); +int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_gsup_peer_id *to_peer, + struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup); diff --git a/include/osmocom/hlr/mslookup_server.h b/include/osmocom/hlr/mslookup_server.h index f76e92f..aed7ad0 100644 --- a/include/osmocom/hlr/mslookup_server.h +++ b/include/osmocom/hlr/mslookup_server.h @@ -63,6 +63,10 @@ extern const struct osmo_ipa_name mslookup_server_msc_wildcard; struct mslookup_server_msc_cfg *mslookup_server_msc_get(const struct osmo_ipa_name *msc_name, bool create); -struct mslookup_service_host *mslookup_server_get_local_gsup_addr(); +const struct mslookup_service_host *mslookup_server_get_local_gsup_addr(); void mslookup_server_rx(const struct osmo_mslookup_query *query, struct osmo_mslookup_result *result); + +bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query, + uint32_t *lu_age_p, struct osmo_ipa_name *local_msc_name, + char *ret_imsi, size_t ret_imsi_len); diff --git a/include/osmocom/hlr/proxy.h b/include/osmocom/hlr/proxy.h index 8412dd2..92ed30a 100644 --- a/include/osmocom/hlr/proxy.h +++ b/include/osmocom/hlr/proxy.h @@ -28,12 +28,6 @@ struct osmo_gsup_req; struct remote_hlr; -struct proxy_pending_gsup_req { - struct llist_head entry; - struct osmo_gsup_req *req; - timestamp_t received_at; -}; - struct proxy { struct llist_head subscr_list; struct llist_head pending_gsup_reqs; @@ -87,8 +81,8 @@ int proxy_subscr_create_or_update(struct proxy *proxy, const struct proxy_subscr *proxy_subscr); int proxy_subscr_del(struct proxy *proxy, const char *imsi); -void proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct osmo_gsup_req *req); +int proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, + struct osmo_gsup_req *req); void proxy_subscr_forward_to_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, struct remote_hlr *remote_hlr, struct osmo_gsup_req *req); @@ -96,6 +90,6 @@ const struct osmo_gsup_message *gsup, struct remote_hlr *from_remote_hlr); void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct remote_hlr *remote_hlr); + const struct osmo_sockaddr_str *remote_hlr_addr); void proxy_subscr_remote_hlr_up(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, struct remote_hlr *remote_hlr); diff --git a/include/osmocom/hlr/remote_hlr.h b/include/osmocom/hlr/remote_hlr.h index 4f9f939..6a4e8a1 100644 --- a/include/osmocom/hlr/remote_hlr.h +++ b/include/osmocom/hlr/remote_hlr.h @@ -40,9 +40,20 @@ struct llist_head entry; struct osmo_sockaddr_str addr; struct osmo_gsup_client *gsupc; + struct llist_head pending_up_callbacks; }; -struct remote_hlr *remote_hlr_get(const struct osmo_sockaddr_str *addr, bool create); +/*! Receive a remote_hlr address when connecting succeeded, or remote_hlr == NULL on error. + * \param addr GSUP IP address and port for which the connection was requested. + * \param remote_hlr The connected remote_hlr ready for sending, or NULL if connecting failed. + * \param data Same a passed to remote_hlr_get_or_connect(). */ +typedef void (*remote_hlr_connect_result_cb_t)(const struct osmo_sockaddr_str *addr, struct remote_hlr *remote_hlr, void *data); + +struct remote_hlr *remote_hlr_get_or_connect(const struct osmo_sockaddr_str *addr, bool connect, + remote_hlr_connect_result_cb_t connect_result_cb, void *data); void remote_hlr_destroy(struct remote_hlr *remote_hlr); int remote_hlr_msgb_send(struct remote_hlr *remote_hlr, struct msgb *msg); -void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req); +void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req, + struct osmo_gsup_message *modified_gsup); + +bool remote_hlr_is_up(struct remote_hlr *remote_hlr); diff --git a/src/dgsm.c b/src/dgsm.c index 647e2ee..57012c8 100644 --- a/src/dgsm.c +++ b/src/dgsm.c @@ -44,8 +44,7 @@ { struct proxy *proxy = g_hlr->gs->proxy; struct proxy_subscr proxy_subscr; - const struct osmo_sockaddr_str *use_addr; - struct remote_hlr *remote_hlr; + const struct osmo_sockaddr_str *remote_hlr_addr; /* A remote HLR is answering back, indicating that it is the home HLR for a given IMSI. * There should be a mostly empty proxy entry for that IMSI. @@ -64,9 +63,9 @@ } if (osmo_sockaddr_str_is_nonzero(&result->host_v4)) - use_addr = &result->host_v4; + remote_hlr_addr = &result->host_v4; else if (osmo_sockaddr_str_is_nonzero(&result->host_v6)) - use_addr = &result->host_v6; + remote_hlr_addr = &result->host_v6; else { LOG_DGSM(query->id.imsi, LOGL_ERROR, "Invalid address for remote HLR: %s\n", osmo_mslookup_result_name_c(OTC_SELECT, query, result)); @@ -74,30 +73,13 @@ return; } - remote_hlr = remote_hlr_get(use_addr, true); - if (!remote_hlr) { - proxy_subscr_del(proxy, query->id.imsi); - return; - } - if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, query->id.imsi)) { LOG_DGSM(query->id.imsi, LOGL_ERROR, "No proxy entry for mslookup result: %s\n", osmo_mslookup_result_name_c(OTC_SELECT, query, result)); return; } - /* The remote HLR already exists and is connected. Messages for this IMSI were spooled because we did not know - * which remote HLR was responsible. Now we know, send this IMSI's messages now. */ - LOG_DGSM(query->id.imsi, LOGL_DEBUG, "Resolved remote HLR, sending spooled GSUP messages: %s\n", - osmo_mslookup_result_name_c(OTC_SELECT, query, result)); - - proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, remote_hlr); - - if (!remote_hlr->gsupc || !remote_hlr->gsupc->is_connected) { - LOG_REMOTE_HLR(remote_hlr, LOGL_DEBUG, "Waiting for link-up\n"); - return; - } - proxy_subscr_remote_hlr_up(proxy, &proxy_subscr, remote_hlr); + proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, remote_hlr_addr); } /* Return true when the message has been handled by D-GSM. */ @@ -114,8 +96,10 @@ return false; /* Are we already forwarding this IMSI to a remote HLR? */ - if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, req->gsup.imsi) == 0) - goto yes_we_are_proxying; + if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, req->gsup.imsi) == 0) { + proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req); + return true; + } /* The IMSI is not known locally, so we want to proxy to a remote HLR, but no proxy entry exists yet. We need to * look up the subscriber in remote HLRs via D-GSM mslookup, forward GSUP and reply once a result is back from @@ -125,40 +109,41 @@ proxy_subscr = (struct proxy_subscr){}; OSMO_STRLCPY_ARRAY(proxy_subscr.imsi, req->gsup.imsi); if (proxy_subscr_create_or_update(proxy, &proxy_subscr)) { - LOG_DGSM(req->gsup.imsi, LOGL_ERROR, "Failed to create proxy entry\n"); - return false; + osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Failed to create proxy entry\n"); + return true; } /* Is a fixed gateway proxy configured? */ if (osmo_sockaddr_str_is_nonzero(&g_hlr->mslookup.client.gsup_gateway_proxy)) { - struct remote_hlr *gsup_gateway_proxy = remote_hlr_get(&g_hlr->mslookup.client.gsup_gateway_proxy, true); - if (!gsup_gateway_proxy) { - LOG_DGSM(req->gsup.imsi, LOGL_ERROR, - "Failed to set up fixed gateway proxy " OSMO_SOCKADDR_STR_FMT "\n", - OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.client.gsup_gateway_proxy)); - return false; - } + proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, &g_hlr->mslookup.client.gsup_gateway_proxy); - proxy_subscr_remote_hlr_resolved(proxy, &proxy_subscr, gsup_gateway_proxy); - - /* Update info */ + /* Proxy database modified, update info */ if (proxy_subscr_get_by_imsi(&proxy_subscr, proxy, req->gsup.imsi)) { - LOG_DGSM(req->gsup.imsi, LOGL_ERROR, "Proxy entry disappeared\n"); - return false; + osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Internal proxy error\n"); + return true; } - goto yes_we_are_proxying; + + proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req); + return true; } - /* Kick off an mslookup for the remote HLR. */ - if (!g_hlr->mslookup.client.client) { + /* Kick off an mslookup for the remote HLR? This check could be up first on the top, but do it only now so that + * if the mslookup client disconnected, we still continue to service open proxy entries. */ + if (!osmo_mslookup_client_active(g_hlr->mslookup.client.client)) { LOG_GSUP_REQ(req, LOGL_DEBUG, "mslookup client not running, cannot query remote home HLR\n"); return false; } + /* First spool message, then kick off mslookup. If the proxy denies this message type, then don't do anything. */ + if (proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req)) { + /* If the proxy denied forwarding, an error response was already generated. */ + return true; + } + query = (struct osmo_mslookup_query){ .id = { .type = OSMO_MSLOOKUP_ID_IMSI, - } + }, }; OSMO_STRLCPY_ARRAY(query.id.imsi, req->gsup.imsi); OSMO_STRLCPY_ARRAY(query.service, OSMO_MSLOOKUP_SERVICE_HLR_GSUP); @@ -171,14 +156,10 @@ LOG_DGSM(req->gsup.imsi, LOGL_ERROR, "Error dispatching mslookup query for home HLR: %s\n", osmo_mslookup_result_name_c(OTC_SELECT, &query, NULL)); proxy_subscr_del(proxy, req->gsup.imsi); + /* mslookup seems to not be working. Try handling it locally. */ return false; } -yes_we_are_proxying: - - /* If the remote HLR is already known, directly forward the GSUP message; otherwise, spool the GSUP message - * until the remote HLR will respond / until timeout aborts. */ - proxy_subscr_forward_to_remote_hlr(proxy, &proxy_subscr, req); return true; } diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c index 62f07c7..88ea58a 100644 --- a/src/dgsm_vty.c +++ b/src/dgsm_vty.c @@ -516,7 +516,7 @@ "List configured service addresses as sent to remote mslookup requests\n") { struct mslookup_server_msc_cfg *msc; - struct mslookup_service_host *local_hlr = mslookup_server_get_local_gsup_addr(); + const struct mslookup_service_host *local_hlr = mslookup_server_get_local_gsup_addr(); vty_out(vty, "Local GSUP HLR address returned in mslookup responses for local IMSIs:"); if (osmo_sockaddr_str_is_nonzero(&local_hlr->host_v4)) diff --git a/src/gsup_server.c b/src/gsup_server.c index 4819ea4..9a9a57b 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -503,3 +503,39 @@ return 0; } + +int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const struct osmo_gsup_peer_id *to_peer, + struct osmo_gsup_req *req, struct osmo_gsup_message *modified_gsup) +{ + int rc; + /* To forward to a remote entity (HLR, SMSC,...), we need to indicate the original source name in the Source + * Name IE to make sure the reply can be routed back. Store the sender in gsup->source_name -- the remote entity + * is required to return this as gsup->destination_name so that the reply gets routed to the original sender. */ + struct osmo_gsup_message forward = *(modified_gsup? : &req->gsup); + + if (req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s", + osmo_gsup_peer_id_type_name(req->source_name.type)); + rc = -ENOTSUP; + goto routing_error; + } + forward.source_name = req->source_name.ipa_name.val; + forward.source_name_len = req->source_name.ipa_name.len; + + if (to_peer->type != OSMO_GSUP_PEER_ID_IPA_NAME) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s", + osmo_gsup_peer_id_type_name(to_peer->type)); + rc = -ENOTSUP; + goto routing_error; + } + LOG_GSUP_REQ(req, LOGL_INFO, "Forwarding to %s\n", osmo_gsup_peer_id_to_str(to_peer)); + rc = osmo_gsup_enc_send_to_ipa_name(server, &to_peer->ipa_name, &forward); + if (rc) + goto routing_error; + osmo_gsup_req_free(req); + return 0; + +routing_error: + osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); + return rc; +} diff --git a/src/hlr.c b/src/hlr.c index 0d8024f..79b50c2 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -507,6 +507,7 @@ return 0; } + /* HLR related messages that are handled at this HLR instance */ switch (req->gsup.message_type) { /* requests sent to us */ case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: diff --git a/src/mslookup_server.c b/src/mslookup_server.c index 29768c8..72729b3 100644 --- a/src/mslookup_server.c +++ b/src/mslookup_server.c @@ -49,7 +49,7 @@ result->age = age; } -struct mslookup_service_host *mslookup_server_get_local_gsup_addr() +const struct mslookup_service_host *mslookup_server_get_local_gsup_addr() { static struct mslookup_service_host gsup_bind = {}; struct mslookup_service_host *host; @@ -190,7 +190,7 @@ static void mslookup_server_rx_hlr_gsup(const struct osmo_mslookup_query *query, struct osmo_mslookup_result *result) { - struct mslookup_service_host *host; + const struct mslookup_service_host *host; int rc; switch (query->id.type) { case OSMO_MSLOOKUP_ID_IMSI: @@ -231,18 +231,21 @@ * VLR, we will find a valid location updating with vlr_number, and no vlr_via_proxy entry. */ static bool subscriber_has_done_lu_here_hlr(const struct osmo_mslookup_query *query, uint32_t *lu_age, - struct osmo_ipa_name *local_msc_name) + struct osmo_ipa_name *local_msc_name, + struct hlr_subscriber *ret_subscr) { - struct hlr_subscriber subscr; + struct hlr_subscriber _subscr; int rc; uint32_t age; + struct hlr_subscriber *subscr = ret_subscr ? : &_subscr; + switch (query->id.type) { case OSMO_MSLOOKUP_ID_IMSI: - rc = db_subscr_get_by_imsi(g_hlr->dbc, query->id.imsi, &subscr); + rc = db_subscr_get_by_imsi(g_hlr->dbc, query->id.imsi, subscr); break; case OSMO_MSLOOKUP_ID_MSISDN: - rc = db_subscr_get_by_msisdn(g_hlr->dbc, query->id.msisdn, &subscr); + rc = db_subscr_get_by_msisdn(g_hlr->dbc, query->id.msisdn, subscr); break; default: LOGP(DMSLOOKUP, LOGL_ERROR, "Unknown mslookup ID type: %d\n", query->id.type); @@ -255,22 +258,22 @@ return false; } - if (!subscr.vlr_number[0]) { + if (!subscr->vlr_number[0]) { LOGP(DMSLOOKUP, LOGL_DEBUG, "%s: not attached (vlr_number unset)\n", osmo_mslookup_result_name_c(OTC_SELECT, query, NULL)); } - if (subscr.vlr_via_proxy.len) { + if (subscr->vlr_via_proxy.len) { /* The VLR is behind a proxy, the subscriber is not attached to a local VLR but a remote one. That * remote proxy should instead respond to the service lookup request. */ LOGP(DMSLOOKUP, LOGL_DEBUG, "%s: last attach is not at local VLR, but at VLR '%s' via proxy %s\n", osmo_mslookup_result_name_c(OTC_SELECT, query, NULL), - subscr.vlr_number, - osmo_ipa_name_to_str(&subscr.vlr_via_proxy)); + subscr->vlr_number, + osmo_ipa_name_to_str(&subscr->vlr_via_proxy)); return false; } - if (!timestamp_age(&subscr.last_lu_seen, &age)) { + if (!timestamp_age(&subscr->last_lu_seen, &age)) { LOGP(DMSLOOKUP, LOGL_DEBUG, "%s: Invalid last_lu_seen timestamp for subscriber\n", osmo_mslookup_result_name_c(OTC_SELECT, query, NULL)); return false; @@ -283,7 +286,7 @@ } *lu_age = age; - osmo_ipa_name_set_str(local_msc_name, subscr.vlr_number); + osmo_ipa_name_set_str(local_msc_name, subscr->vlr_number); LOGP(DMSLOOKUP, LOGL_DEBUG, "%s: attached %u seconds ago at local VLR %s\n", osmo_mslookup_result_name_c(OTC_SELECT, query, NULL), age, osmo_ipa_name_to_str(local_msc_name)); @@ -297,7 +300,8 @@ */ static bool subscriber_has_done_lu_here_proxy(const struct osmo_mslookup_query *query, uint32_t *lu_age, - struct osmo_ipa_name *local_msc_name) + struct osmo_ipa_name *local_msc_name, + struct proxy_subscr *ret_proxy_subscr) { struct proxy_subscr proxy_subscr; uint32_t age; @@ -350,12 +354,14 @@ age, osmo_ipa_name_to_str(local_msc_name), OSMO_SOCKADDR_STR_FMT_ARGS(&proxy_subscr.remote_hlr_addr)); + if (ret_proxy_subscr) + *ret_proxy_subscr = proxy_subscr; return true; } -static bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query, - uint32_t *lu_age_p, - struct osmo_ipa_name *local_msc_name) +bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query, + uint32_t *lu_age_p, struct osmo_ipa_name *local_msc_name, + char *ret_imsi, size_t ret_imsi_len) { bool attached_here; uint32_t lu_age = 0; @@ -363,6 +369,9 @@ bool attached_here_proxy; uint32_t proxy_lu_age = 0; struct osmo_ipa_name proxy_msc_name = {}; + struct proxy_subscr proxy_subscr; + struct hlr_subscriber db_subscr; + /* First ask the local HLR db, but if the local proxy record indicates a more recent LU, use that instead. * For all usual cases, only one of these will reflect a LU, even if a subscriber had more than one home HLR: @@ -372,14 +381,19 @@ * the local HLR database, there might occur a situation where both reflect a LU. So, to be safe against all * situations, compare the two entries. */ - attached_here = subscriber_has_done_lu_here_hlr(query, &lu_age, &msc_name); - attached_here_proxy = subscriber_has_done_lu_here_proxy(query, &proxy_lu_age, &proxy_msc_name); + attached_here = subscriber_has_done_lu_here_hlr(query, &lu_age, &msc_name, &db_subscr); + attached_here_proxy = subscriber_has_done_lu_here_proxy(query, &proxy_lu_age, &proxy_msc_name, &proxy_subscr); /* If proxy has a younger lu, replace. */ if (attached_here_proxy && (!attached_here || (proxy_lu_age < lu_age))) { attached_here = true; lu_age = proxy_lu_age; msc_name = proxy_msc_name; + if (ret_imsi) + osmo_strlcpy(ret_imsi, proxy_subscr.imsi, ret_imsi_len); + } else if (attached_here) { + if (ret_imsi) + osmo_strlcpy(ret_imsi, db_subscr.imsi, ret_imsi_len); } if (attached_here && !msc_name.len) { @@ -403,7 +417,7 @@ /* A remote entity is asking us whether we are providing the given service for the given subscriber. */ void mslookup_server_rx(const struct osmo_mslookup_query *query, - struct osmo_mslookup_result *result) + struct osmo_mslookup_result *result) { const struct mslookup_service_host *service_host; uint32_t age; @@ -417,7 +431,7 @@ /* All other service types: answer when the subscriber has done a LU that is either listed in the local HLR or * in the GSUP proxy database: i.e. if the subscriber has done a Location Updating at an VLR belonging to this * HLR. Respond with whichever services are configured in the osmo-hlr.cfg. */ - if (!subscriber_has_done_lu_here(query, &age, &msc_name)) { + if (!subscriber_has_done_lu_here(query, &age, &msc_name, NULL, 0)) { *result = not_found; return; } diff --git a/src/proxy.c b/src/proxy.c index 0d3fd13..b9cd313 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -47,7 +47,8 @@ (gsup_msg) ? osmo_gsup_message_type_name((gsup_msg)->message_type) : "NULL", \ ##args) -/* Why have a separate struct to add an llist_head entry? +/* The proxy subscriber database. + * Why have a separate struct to add an llist_head entry? * This is to keep the option open to store the proxy data in the database instead, without any visible effect outside * of proxy.c. */ struct proxy_subscr_listentry { @@ -56,10 +57,16 @@ struct proxy_subscr data; }; +struct proxy_pending_gsup_req { + struct llist_head entry; + struct osmo_gsup_req *req; + timestamp_t received_at; +}; + /* Defer a GSUP message until we know a remote HLR to proxy to. * Where to send this GSUP message is indicated by its IMSI: as soon as an MS lookup has yielded the IMSI's home HLR, * that's where the message should go. */ -static void proxy_defer_gsup_req(struct proxy *proxy, struct osmo_gsup_req *req) +static void proxy_deferred_gsup_req_add(struct proxy *proxy, struct osmo_gsup_req *req) { struct proxy_pending_gsup_req *m; @@ -70,49 +77,46 @@ llist_add_tail(&m->entry, &proxy->pending_gsup_reqs); } -/* Unable to resolve remote HLR for this IMSI, Answer with error back to the sender. */ -static void proxy_defer_gsup_message_err(struct proxy *proxy, struct proxy_pending_gsup_req *m) +static void proxy_pending_req_remote_hlr_connect_result(struct osmo_gsup_req *req, struct remote_hlr *remote_hlr) { - osmo_gsup_req_respond_err(m->req, GMM_CAUSE_IMSI_UNKNOWN, "could not reach home HLR"); - m->req = NULL; + if (!remote_hlr || !remote_hlr_is_up(remote_hlr)) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_IMSI_UNKNOWN, "Proxy: Failed to connect to home HLR"); + return; + } + + remote_hlr_gsup_forward_to_remote_hlr(remote_hlr, req, NULL); } -/* Forward spooled message for this IMSI to remote HLR. */ -static void proxy_defer_gsup_message_send(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct proxy_pending_gsup_req *m, struct remote_hlr *remote_hlr) +static bool proxy_deferred_gsup_req_waiting(struct proxy *proxy, const char *imsi) { - LOG_PROXY_SUBSCR_MSG(proxy_subscr, &m->req->gsup, LOGL_INFO, "Forwarding deferred message\n"); - proxy_subscr_forward_to_remote_hlr_resolved(proxy, proxy_subscr, remote_hlr, m->req); - m->req = NULL; -} - -/* Result of looking for remote HLR. If it failed, pass remote_hlr as NULL. On failure, the proxy_subscr and the - * remote_hlr may be passed NULL. The IMSI then reflects who the error was for. */ -static void proxy_defer_gsup_message_pop(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - const char *imsi, struct remote_hlr *remote_hlr) -{ - struct proxy_pending_gsup_req *m, *n; - if (!imsi && proxy_subscr) - imsi = proxy_subscr->imsi; + struct proxy_pending_gsup_req *p; OSMO_ASSERT(imsi); - if (!remote_hlr) - LOGP(DDGSM, LOGL_ERROR, "IMSI-%s: No remote HLR found, dropping spooled GSUP messages\n", imsi); - - llist_for_each_entry_safe(m, n, &proxy->pending_gsup_reqs, entry) { - if (strcmp(m->req->gsup.imsi, imsi)) + llist_for_each_entry(p, &proxy->pending_gsup_reqs, entry) { + if (strcmp(p->req->gsup.imsi, imsi)) continue; - - if (!remote_hlr) - proxy_defer_gsup_message_err(proxy, m); - else - proxy_defer_gsup_message_send(proxy, proxy_subscr, m, remote_hlr); - - llist_del(&m->entry); - talloc_free(m); + return true; } + return false; } +/* Result of looking for remote HLR. If it failed, pass remote_hlr as NULL. On failure, the remote_hlr may be passed + * NULL. */ +static void proxy_deferred_gsup_req_pop(struct proxy *proxy, const char *imsi, struct remote_hlr *remote_hlr) +{ + struct proxy_pending_gsup_req *p, *n; + OSMO_ASSERT(imsi); + + llist_for_each_entry_safe(p, n, &proxy->pending_gsup_reqs, entry) { + if (strcmp(p->req->gsup.imsi, imsi)) + continue; + + proxy_pending_req_remote_hlr_connect_result(p->req, remote_hlr); + p->req = NULL; + llist_del(&p->entry); + talloc_free(p); + } +} static bool proxy_subscr_matches_imsi(const struct proxy_subscr *proxy_subscr, const char *imsi) { @@ -170,21 +174,6 @@ return 0; } -void proxy_subscrs_get_by_remote_hlr(struct proxy *proxy, const struct osmo_sockaddr_str *remote_hlr_addr, - bool (*yield)(struct proxy *proxy, const struct proxy_subscr *subscr, void *data), - void *data) -{ - struct proxy_subscr_listentry *e; - if (!proxy) - return; - llist_for_each_entry(e, &proxy->subscr_list, entry) { - if (!osmo_sockaddr_str_cmp(remote_hlr_addr, &e->data.remote_hlr_addr)) { - if (!yield(proxy, &e->data, data)) - return; - } - } -} - int proxy_subscr_create_or_update(struct proxy *proxy, const struct proxy_subscr *proxy_subscr) { struct proxy_subscr_listentry *e = _proxy_get_by_imsi(proxy, proxy_subscr->imsi); @@ -207,7 +196,7 @@ int proxy_subscr_del(struct proxy *proxy, const char *imsi) { struct proxy_subscr_listentry *e; - proxy_defer_gsup_message_pop(proxy, NULL, imsi, NULL); + proxy_deferred_gsup_req_pop(proxy, imsi, NULL); e = _proxy_get_by_imsi(proxy, imsi); if (!e) return -ENOENT; @@ -264,42 +253,6 @@ talloc_free(proxy); } -void proxy_subscr_remote_hlr_up(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct remote_hlr *remote_hlr) -{ - proxy_defer_gsup_message_pop(proxy, proxy_subscr, proxy_subscr->imsi, remote_hlr); -} - -void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct remote_hlr *remote_hlr) -{ - struct proxy_subscr proxy_subscr_new; - - if (osmo_sockaddr_str_is_nonzero(&proxy_subscr->remote_hlr_addr)) { - if (!osmo_sockaddr_str_cmp(&remote_hlr->addr, &proxy_subscr->remote_hlr_addr)) { - /* Already have this remote address */ - return; - } else { - LOG_PROXY_SUBSCR(proxy_subscr, LOGL_NOTICE, - "Remote HLR address changes to " OSMO_SOCKADDR_STR_FMT "\n", - OSMO_SOCKADDR_STR_FMT_ARGS(&remote_hlr->addr)); - } - } - - /* Store the address. Make a copy to modify. */ - proxy_subscr_new = *proxy_subscr; - proxy_subscr_new.remote_hlr_addr = remote_hlr->addr; - - if (proxy_subscr_create_or_update(proxy, &proxy_subscr_new)) { - LOG_PROXY_SUBSCR(proxy_subscr, LOGL_ERROR, "Failed to store proxy entry for remote HLR\n"); - /* If no remote HLR is known for the IMSI, the proxy entry is pointless. */ - proxy_subscr_del(proxy, proxy_subscr_new.imsi); - return; - } - proxy_subscr = &proxy_subscr_new; - LOG_PROXY_SUBSCR(proxy_subscr, LOGL_DEBUG, "Remote HLR resolved, stored address\n"); -} - /* All GSUP messages sent to the remote HLR pass through this function, to modify the subscriber state or disallow * sending the message. Return 0 to allow sending the message. */ static int proxy_acknowledge_gsup_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, @@ -457,27 +410,77 @@ return 0; } - -void proxy_subscr_forward_to_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, - struct remote_hlr *remote_hlr, struct osmo_gsup_req *req) +static void proxy_remote_hlr_connect_result_cb(const struct osmo_sockaddr_str *addr, struct remote_hlr *remote_hlr, + void *data) { - if (proxy_acknowledge_gsup_to_remote_hlr(proxy, proxy_subscr, req)) { - osmo_gsup_req_respond_err(req, GMM_CAUSE_PROTO_ERR_UNSPEC, "Proxy does not allow this message"); + struct proxy *proxy = data; + struct proxy_subscr_listentry *e; + if (!proxy) return; + llist_for_each_entry(e, &proxy->subscr_list, entry) { + if (!osmo_sockaddr_str_cmp(addr, &e->data.remote_hlr_addr)) { + proxy_deferred_gsup_req_pop(proxy, e->data.imsi, remote_hlr); + } } - - remote_hlr_gsup_forward_to_remote_hlr(remote_hlr, req); } -void proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, struct osmo_gsup_req *req) +/* Store the remote HLR's GSUP address for this proxy subscriber. + * This can be set before the remote_hlr is connected, or after. + * And, this can be set before the gsup_req has been queued for this HLR, or after. + */ +void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, + const struct osmo_sockaddr_str *remote_hlr_addr) +{ + struct proxy_subscr proxy_subscr_new; + + if (osmo_sockaddr_str_is_nonzero(&proxy_subscr->remote_hlr_addr)) { + if (!osmo_sockaddr_str_cmp(remote_hlr_addr, &proxy_subscr->remote_hlr_addr)) { + /* Already have this remote address */ + return; + } else { + LOG_PROXY_SUBSCR(proxy_subscr, LOGL_NOTICE, + "Remote HLR address changes to " OSMO_SOCKADDR_STR_FMT "\n", + OSMO_SOCKADDR_STR_FMT_ARGS(remote_hlr_addr)); + } + } + + /* Store the address. Make a copy to modify. */ + proxy_subscr_new = *proxy_subscr; + proxy_subscr = &proxy_subscr_new; + proxy_subscr_new.remote_hlr_addr = *remote_hlr_addr; + + if (proxy_subscr_create_or_update(proxy, proxy_subscr)) { + LOG_PROXY_SUBSCR(proxy_subscr, LOGL_ERROR, "Failed to store proxy entry for remote HLR\n"); + /* If no remote HLR is known for the IMSI, the proxy entry is pointless. */ + proxy_subscr_del(proxy, proxy_subscr->imsi); + return; + } + LOG_PROXY_SUBSCR(proxy_subscr, LOGL_DEBUG, "Remote HLR resolved, stored address\n"); + + /* If any messages for this HLR are already spooled, connect now. Otherwise wait for + * proxy_subscr_forward_to_remote_hlr() to connect then. */ + if (proxy_deferred_gsup_req_waiting(proxy, proxy_subscr->imsi)) + remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, true, + proxy_remote_hlr_connect_result_cb, proxy); +} + +int proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, struct osmo_gsup_req *req) { struct remote_hlr *remote_hlr; + int rc; + + rc = proxy_acknowledge_gsup_to_remote_hlr(proxy, proxy_subscr, req); + if (rc) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_PROTO_ERR_UNSPEC, "Proxy does not allow this message"); + return rc; + } if (!osmo_sockaddr_str_is_nonzero(&proxy_subscr->remote_hlr_addr)) { - /* We don't know the remote target yet. Still waiting for an MS lookup response. */ + /* We don't know the remote target yet. Still waiting for an MS lookup response, which will end up + * calling proxy_subscr_remote_hlr_resolved(). See dgsm.c. */ LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_DEBUG, "deferring until remote HLR is known\n"); - proxy_defer_gsup_req(proxy, req); - return; + proxy_deferred_gsup_req_add(proxy, req); + return 0; } if (!osmo_gsup_peer_id_is_empty(&req->via_proxy)) { @@ -489,23 +492,22 @@ osmo_gsup_peer_id_to_str(&req->source_name)); } - remote_hlr = remote_hlr_get(&proxy_subscr->remote_hlr_addr, true); - if (!remote_hlr) { - osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, - "Proxy: Failed to establish connection to remote HLR " OSMO_SOCKADDR_STR_FMT, - OSMO_SOCKADDR_STR_FMT_ARGS(&proxy_subscr->remote_hlr_addr)); - return; + /* We could always store in the defer queue and empty the queue if the connection is already up. + * Slight optimisation: if the remote_hlr is already up and running, skip the defer queue. + * First ask for an existing remote_hlr. */ + remote_hlr = remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, false, NULL, NULL); + if (remote_hlr && remote_hlr_is_up(remote_hlr)) { + proxy_pending_req_remote_hlr_connect_result(req, remote_hlr); + return 0; } - if (!remote_hlr->gsupc || !remote_hlr->gsupc->is_connected) { - /* GSUP link is still busy establishing... */ - LOG_PROXY_SUBSCR_MSG(proxy_subscr, &req->gsup, LOGL_DEBUG, - "deferring until link to remote HLR is up\n"); - proxy_defer_gsup_req(proxy, req); - return; - } - - proxy_subscr_forward_to_remote_hlr_resolved(proxy, proxy_subscr, remote_hlr, req); + /* Not existing or not up. Defer req and ask to be notified when it is up. + * If the remote_hlr exists but is not connected yet, there should actually already be a pending + * proxy_remote_hlr_connect_result_cb queued, but it doesn't hurt to do that more often. */ + proxy_deferred_gsup_req_add(proxy, req); + remote_hlr_get_or_connect(&proxy_subscr->remote_hlr_addr, true, + proxy_remote_hlr_connect_result_cb, proxy); + return 0; } int proxy_subscr_forward_to_vlr(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, diff --git a/src/remote_hlr.c b/src/remote_hlr.c index 42bf700..e2e7d47 100644 --- a/src/remote_hlr.c +++ b/src/remote_hlr.c @@ -100,16 +100,16 @@ return 0; } -static bool remote_hlr_up_yield(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, void *data) -{ - struct remote_hlr *remote_hlr = data; - proxy_subscr_remote_hlr_up(proxy, proxy_subscr, remote_hlr); - return true; -} +struct remote_hlr_pending_up { + struct llist_head entry; + remote_hlr_connect_result_cb_t connect_result_cb; + void *data; +}; static bool remote_hlr_up_down(struct osmo_gsup_client *gsupc, bool up) { struct remote_hlr *remote_hlr = gsupc->data; + struct remote_hlr_pending_up *p, *n; if (!up) { LOG_REMOTE_HLR(remote_hlr, LOGL_NOTICE, "link to remote HLR is down, removing GSUP client\n"); remote_hlr_destroy(remote_hlr); @@ -117,22 +117,41 @@ } LOG_REMOTE_HLR(remote_hlr, LOGL_NOTICE, "link up\n"); - proxy_subscrs_get_by_remote_hlr(g_hlr->gs->proxy, &remote_hlr->addr, remote_hlr_up_yield, remote_hlr); + llist_for_each_entry_safe(p, n, &remote_hlr->pending_up_callbacks, entry) { + if (p->connect_result_cb) + p->connect_result_cb(&remote_hlr->addr, remote_hlr, p->data); + llist_del(&p->entry); + } return true; } -struct remote_hlr *remote_hlr_get(const struct osmo_sockaddr_str *addr, bool create) +bool remote_hlr_is_up(struct remote_hlr *remote_hlr) { - struct remote_hlr *rh; + return remote_hlr && remote_hlr->gsupc && remote_hlr->gsupc->is_connected; +} + +struct remote_hlr *remote_hlr_get_or_connect(const struct osmo_sockaddr_str *addr, bool connect, + remote_hlr_connect_result_cb_t connect_result_cb, void *data) +{ + struct remote_hlr *rh = NULL; + struct remote_hlr *rh_i; struct osmo_gsup_client_config cfg; - llist_for_each_entry(rh, &remote_hlrs, entry) { - if (!osmo_sockaddr_str_cmp(&rh->addr, addr)) - return rh; + llist_for_each_entry(rh_i, &remote_hlrs, entry) { + if (!osmo_sockaddr_str_cmp(&rh_i->addr, addr)) { + rh = rh_i; + break; + } } - if (!create) + if (rh) + goto add_result_cb; + + if (!connect) { + if (connect_result_cb) + connect_result_cb(addr, NULL, data); return NULL; + } /* Doesn't exist yet, create a GSUP client to remote HLR. */ cfg = (struct osmo_gsup_client_config){ @@ -150,15 +169,33 @@ .addr = *addr, .gsupc = osmo_gsup_client_create3(rh, &cfg), }; + INIT_LLIST_HEAD(&rh->pending_up_callbacks); if (!rh->gsupc) { LOGP(DDGSM, LOGL_ERROR, "Failed to establish connection to remote HLR " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(addr)); talloc_free(rh); + if (connect_result_cb) + connect_result_cb(addr, NULL, data); return NULL; } + rh->gsupc->data = rh; llist_add(&rh->entry, &remote_hlrs); + +add_result_cb: + if (connect_result_cb) { + if (remote_hlr_is_up(rh)) { + connect_result_cb(addr, rh, data); + } else { + struct remote_hlr_pending_up *p; + p = talloc_zero(rh, struct remote_hlr_pending_up); + OSMO_ASSERT(p); + p->connect_result_cb = connect_result_cb; + p->data = data; + llist_add_tail(&p->entry, &rh->pending_up_callbacks); + } + } return rh; } @@ -182,14 +219,19 @@ } /* A GSUP message was received from the MS/MSC side, forward it to the remote HLR. */ -void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req) +void remote_hlr_gsup_forward_to_remote_hlr(struct remote_hlr *remote_hlr, struct osmo_gsup_req *req, + struct osmo_gsup_message *modified_gsup) { int rc; struct msgb *msg; /* To forward to a remote HLR, we need to indicate the source MSC's name in the Source Name IE to make sure the * reply can be routed back. Store the sender MSC in gsup->source_name -- the remote HLR is required to return * this as gsup->destination_name so that the reply gets routed to the original MSC. */ - struct osmo_gsup_message forward = req->gsup; + struct osmo_gsup_message forward; + if (modified_gsup) + forward = *modified_gsup; + else + forward = req->gsup; if (req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) { osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "Unsupported GSUP peer id type: %s", diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am index 6df538f..0b18d61 100644 --- a/tests/gsup_server/Makefile.am +++ b/tests/gsup_server/Makefile.am @@ -31,6 +31,7 @@ gsup_server_test_LDADD = \ $(top_srcdir)/src/gsup_server.c \ $(top_srcdir)/src/gsup_router.c \ + $(top_srcdir)/src/gsup_send.c \ $(top_srcdir)/src/gsupclient/gsup_peer_id.c \ $(top_srcdir)/src/gsupclient/gsup_req.c \ $(LIBOSMOCORE_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I43ad27f6d768df02abb3459ac4c43bb80cc1cbeb Gerrit-Change-Number: 16762 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:11:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:11:27 +0000 Subject: Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16763 ) Change subject: auc3g: officially wrap IND around IND_bitlen space ...................................................................... auc3g: officially wrap IND around IND_bitlen space To determine distinct IND pools for each connected VLR, we need to pick ever increasing values for any new peer showing up. Each subscriber's individual IND_bitlen is then required to modulo the least significant N of bits that fit in its IND_bitlen to effectively round-robin in the available IND pool space. So far we did that but issued a warning message. This is actually exactly what we want and it doesn't need to be treated like it weren't so. Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e --- M src/db_auc.c 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/63/16763/1 diff --git a/src/db_auc.c b/src/db_auc.c index ecb9f58..975eb2d 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -200,15 +200,16 @@ if (rc) return rc; + /* modulo by the IND bitlen value range. For example, ind_bitlen == 5 would modulo 32: + * 1 << 5 == 0b0100000 == 32 + * - 1 == 0b0011111 == bitmask of 5 lowest bits + * x &= 0b0011111 == modulo 32 + * Why do this? osmo-hlr cannot possibly choose individual VLR INDs always matching all subscribers' IND_bitlen, + * which might vary wildly. Instead, let hlr.c pass in an arbitrarily high number here, and the modulo does a + * round-robin if the IND pools that this subscriber has available. */ + auc_3g_ind &= (1U << aud3g.u.umts.ind_bitlen) - 1; aud3g.u.umts.ind = auc_3g_ind; - if (aud3g.type == OSMO_AUTH_TYPE_UMTS - && aud3g.u.umts.ind >= (1U << aud3g.u.umts.ind_bitlen)) { - LOGAUC(imsi, LOGL_NOTICE, "3G auth: SQN's IND bitlen %u is" - " too small to hold an index of %u. Truncating. This" - " may cause numerous additional AUTS resyncing.\n", - aud3g.u.umts.ind_bitlen, aud3g.u.umts.ind); - aud3g.u.umts.ind &= (1U << aud3g.u.umts.ind_bitlen) - 1; - } + /* the first bit (bit0) cannot be used as AMF anymore, but has been * re-appropriated as the separation bit. See 3GPP TS 33.102 Annex H * together with 3GPP TS 33.401 / 33.402 / 33.501 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:11:28 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:11:28 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... db v6: determine 3G AUC IND from VLR name Each VLR requesting auth tuples should use a distinct IND pool for 3G auth. So far we tied the IND to the GSUP peer connection; MSC and SGSN were always distinct GSUP peers, they ended up using distinct INDs. However, we have implemented a GSUP proxy, so that, in a distributed setup, a remotely roaming subscriber has only one direct GSUP peer proxying for both remote MSC and SGSN. That means as soon as a subscriber roams to a different site, we would use the GSUP proxy name to determine the IND instead of the separate MSC and SGSN. The site's MSC and SGSN appear as the same client, get the same IND bucket, waste SQNs rapidly and cause auth tuple generation load. So instead of using the local client as IND, persistently keep a list of VLR names and assign a different IND to each. Use the gsup_req->source_name as indicator, which reflects the actual remote VLR's name (remote MSC or SGSN). Persist the site <-> IND assignments in the database. Add an IND test to db_test.c There was an earlier patch version that separated the IND pools by cn_domain, but it turned out to add complex semantics, while only solving one aspect of the "adjacent VLR" problem. We need a solution not only for CS vs PS, but also for 2,3G vs 4G, and for sites that are physically adjacent to each other. This patch version does not offer any automatic solution for that -- as soon as more than 2^IND_bitlen (usually 32) VLRs show up, it is the responsibility of the admin to ensure the 'ind' table in the hlr.db does not have unfortunate IND assignments. So far no VTY commands exist for that, they may be added in the future. Related: OS#4319 Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 --- M include/osmocom/hlr/db.h M sql/hlr.sql M src/db.c M src/db_hlr.c M src/gsupclient/gsup_peer_id.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err M tests/db_upgrade/db_upgrade_test.ok 9 files changed, 296 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/16764/1 diff --git a/include/osmocom/hlr/db.h b/include/osmocom/hlr/db.h index 9309b8f..1f1bacb 100644 --- a/include/osmocom/hlr/db.h +++ b/include/osmocom/hlr/db.h @@ -4,6 +4,7 @@ #include #include +#include struct hlr; @@ -33,6 +34,9 @@ DB_STMT_SET_LAST_LU_SEEN_PS, DB_STMT_EXISTS_BY_IMSI, DB_STMT_EXISTS_BY_MSISDN, + DB_STMT_IND_ADD, + DB_STMT_IND_SELECT, + DB_STMT_IND_DEL, _NUM_DB_STMT }; @@ -163,6 +167,9 @@ int db_subscr_purge(struct db_context *dbc, const char *by_imsi, bool purge_val, bool is_ps); +int db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr, unsigned int *ind); +int db_ind_del(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr); + /*! Call sqlite3_column_text() and copy result to a char[]. * \param[out] buf A char[] used as sizeof() arg(!) and osmo_strlcpy() target. * \param[in] stmt An sqlite3_stmt*. diff --git a/sql/hlr.sql b/sql/hlr.sql index 98e586d..e855a6c 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -79,8 +79,16 @@ ind_bitlen INTEGER NOT NULL DEFAULT 5 ); +CREATE TABLE ind ( + -- 3G auth IND pool to be used for this VLR + ind INTEGER PRIMARY KEY, + -- VLR identification, usually the GSUP source_name + vlr TEXT NOT NULL, + UNIQUE (vlr) +); + CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); -- Set HLR database schema version number -- Note: This constant is currently duplicated in src/db.c and must be kept in sync! -PRAGMA user_version = 5; +PRAGMA user_version = 6; diff --git a/src/db.c b/src/db.c index 3cbd9c9..c265ffa 100644 --- a/src/db.c +++ b/src/db.c @@ -30,7 +30,7 @@ #include "db_bootstrap.h" /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ -#define CURRENT_SCHEMA_VERSION 5 +#define CURRENT_SCHEMA_VERSION 6 #define SEL_COLUMNS \ "id," \ @@ -87,6 +87,9 @@ [DB_STMT_SET_LAST_LU_SEEN_PS] = "UPDATE subscriber SET last_lu_seen_ps = datetime($val, 'unixepoch') WHERE id = $subscriber_id", [DB_STMT_EXISTS_BY_IMSI] = "SELECT 1 FROM subscriber WHERE imsi = $imsi", [DB_STMT_EXISTS_BY_MSISDN] = "SELECT 1 FROM subscriber WHERE msisdn = $msisdn", + [DB_STMT_IND_ADD] = "INSERT INTO ind (vlr) VALUES ($vlr)", + [DB_STMT_IND_SELECT] = "SELECT ind FROM ind WHERE vlr = $vlr", + [DB_STMT_IND_DEL] = "DELETE FROM ind WHERE vlr = $vlr", }; static void sql3_error_log_cb(void *arg, int err_code, const char *msg) @@ -481,6 +484,29 @@ return rc; } +static int db_upgrade_v6(struct db_context *dbc) +{ + int rc; + const char *statements[] = { + "CREATE TABLE ind (\n" + " -- 3G auth IND pool to be used for this VLR\n" + " ind INTEGER PRIMARY KEY,\n" + " -- VLR identification, usually the GSUP source_name\n" + " vlr TEXT NOT NULL,\n" + " UNIQUE (vlr)\n" + ")" + , + "PRAGMA user_version = 6", + }; + + rc = db_run_statements(dbc, statements, ARRAY_SIZE(statements)); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version 6\n"); + return rc; + } + return rc; +} + typedef int (*db_upgrade_func_t)(struct db_context *dbc); static db_upgrade_func_t db_upgrade_path[] = { db_upgrade_v1, @@ -488,6 +514,7 @@ db_upgrade_v3, db_upgrade_v4, db_upgrade_v5, + db_upgrade_v6, }; static int db_get_user_version(struct db_context *dbc) diff --git a/src/db_hlr.c b/src/db_hlr.c index 030a6a7..b13763a 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -884,3 +884,106 @@ return ret; } + +static int _db_ind_run(struct db_context *dbc, sqlite3_stmt *stmt, const char *vlr, bool reset) +{ + int rc; + + if (!db_bind_text(stmt, "$vlr", vlr)) + return -EIO; + + /* execute the statement */ + rc = sqlite3_step(stmt); + if (reset) + db_remove_reset(stmt); + return rc; +} + +static int _db_ind_add(struct db_context *dbc, const char *vlr) +{ + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_ADD]; + if (_db_ind_run(dbc, stmt, vlr, true) != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Cannot create IND entry for %s\n", osmo_quote_str_c(OTC_SELECT, vlr, -1)); + return -EIO; + } + return 0; +} + +static int _db_ind_del(struct db_context *dbc, const char *vlr) +{ + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_DEL]; + _db_ind_run(dbc, stmt, vlr, true); + /* We don't really care about the result. If it didn't exist, then that was the goal anyway. */ + return 0; +} + +static int _db_ind_get(struct db_context *dbc, const char *vlr, unsigned int *ind) +{ + int ret = 0; + sqlite3_stmt *stmt = dbc->stmt[DB_STMT_IND_SELECT]; + int rc = _db_ind_run(dbc, stmt, vlr, false); + if (rc == SQLITE_DONE) { + /* Does not exist yet */ + ret = -ENOENT; + goto out; + } else if (rc != SQLITE_ROW) { + LOGP(DDB, LOGL_ERROR, "Error executing SQL: %d\n", rc); + ret = -EIO; + goto out; + } + + OSMO_ASSERT(ind); + *ind = sqlite3_column_int64(stmt, 0); +out: + db_remove_reset(stmt); + return ret; +} + +int _db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr, + unsigned int *ind, bool del) +{ + const char *vlr_name = NULL; + int rc; + + switch (vlr->type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + if (vlr->ipa_name.len < 2 || vlr->ipa_name.val[vlr->ipa_name.len - 1] != '\0') { + LOGP(DDB, LOGL_ERROR, "Expecting VLR ipa_name to be zero terminated; found %s\n", + osmo_ipa_name_to_str(&vlr->ipa_name)); + return -ENOTSUP; + } + vlr_name = (const char*)vlr->ipa_name.val; + break; + default: + LOGP(DDB, LOGL_ERROR, "Unsupported osmo_gsup_peer_id type: %s\n", + osmo_gsup_peer_id_type_name(vlr->type)); + return -ENOTSUP; + } + + if (del) + return _db_ind_del(dbc, vlr_name); + + rc = _db_ind_get(dbc, vlr_name, ind); + if (!rc) + return 0; + + /* Does not exist yet, create. */ + rc = _db_ind_add(dbc, vlr_name); + if (rc) { + LOGP(DDB, LOGL_ERROR, "Error creating IND entry for %s\n", osmo_quote_str_c(OTC_SELECT, vlr_name, -1)); + return rc; + } + + /* To be sure, query again from scratch. */ + return _db_ind_get(dbc, vlr_name, ind); +} + +int db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr, unsigned int *ind) +{ + return _db_ind(dbc, vlr, ind, false); +} + +int db_ind_del(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr) +{ + return _db_ind(dbc, vlr, NULL, true); +} diff --git a/src/gsupclient/gsup_peer_id.c b/src/gsupclient/gsup_peer_id.c index 9ac3af9..0a7bd73 100644 --- a/src/gsupclient/gsup_peer_id.c +++ b/src/gsupclient/gsup_peer_id.c @@ -132,8 +132,11 @@ va_list ap; int rc; + *gsup_peer_id = (struct osmo_gsup_peer_id){}; + switch (type) { case OSMO_GSUP_PEER_ID_IPA_NAME: + gsup_peer_id->type = OSMO_GSUP_PEER_ID_IPA_NAME; va_start(ap, str_fmt); rc = osmo_ipa_name_set_str_va(&gsup_peer_id->ipa_name, str_fmt, ap); va_end(ap); diff --git a/src/hlr.c b/src/hlr.c index 79b50c2..215c0e8 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -280,12 +280,13 @@ ***********************************************************************/ /* process an incoming SAI request */ -static int rx_send_auth_info(unsigned int auc_3g_ind, struct osmo_gsup_req *req) +static int rx_send_auth_info(struct osmo_gsup_req *req) { struct osmo_gsup_message gsup_out = { .message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, }; bool separation_bit = false; + unsigned int auc_3g_ind; int rc; subscr_create_on_demand(req->gsup.imsi); @@ -293,6 +294,15 @@ if (req->gsup.current_rat_type == OSMO_RAT_EUTRAN_SGS) separation_bit = true; + rc = db_ind(g_hlr->dbc, &req->source_name, &auc_3g_ind); + if (rc) { + LOG_GSUP_REQ(req, LOGL_ERROR, + "Unable to determine 3G auth IND for source %s (rc=%d)," + " generating tuples with IND = 0\n", + osmo_gsup_peer_id_to_str(&req->source_name), rc); + auc_3g_ind = 0; + } + rc = db_get_auc(g_hlr->dbc, req->gsup.imsi, auc_3g_ind, gsup_out.auth_vectors, ARRAY_SIZE(gsup_out.auth_vectors), @@ -511,7 +521,7 @@ switch (req->gsup.message_type) { /* requests sent to us */ case OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: - rx_send_auth_info(conn->auc_3g_ind, req); + rx_send_auth_info(req); break; case OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: rx_upd_loc_req(conn, req); diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 4a0f3e8..bbc728e 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -918,6 +918,50 @@ comment_end(); } +static void test_ind() +{ + comment_start(); + +#define ASSERT_IND(VLR, IND) do { \ + unsigned int ind; \ + struct osmo_gsup_peer_id vlr; \ + OSMO_ASSERT(!osmo_gsup_peer_id_set_str(&vlr, OSMO_GSUP_PEER_ID_IPA_NAME, VLR)); \ + ASSERT_RC(db_ind(dbc, &vlr, &ind), 0); \ + fprintf(stderr, "%s ind = %u\n\n", osmo_quote_str((char*)vlr.ipa_name.val, vlr.ipa_name.len), ind); \ + if (ind != (IND)) \ + fprintf(stderr, " ERROR: expected " #IND "\n"); \ + } while (0) +#define IND_DEL(VLR) do { \ + struct osmo_gsup_peer_id vlr; \ + OSMO_ASSERT(!osmo_gsup_peer_id_set_str(&vlr, OSMO_GSUP_PEER_ID_IPA_NAME, VLR)); \ + ASSERT_RC(db_ind_del(dbc, &vlr), 0); \ + fprintf(stderr, "%s ind deleted\n\n", osmo_quote_str((char*)vlr.ipa_name.val, vlr.ipa_name.len)); \ + } while (0) + + ASSERT_IND("msc-23", 1); + ASSERT_IND("sgsn-11", 2); + ASSERT_IND("msc-42", 3); + ASSERT_IND("sgsn-22", 4); + ASSERT_IND("msc-0x17", 5); + ASSERT_IND("sgsn-0xaa", 6); + ASSERT_IND("msc-42", 3); + ASSERT_IND("sgsn-22", 4); + ASSERT_IND("msc-0x17", 5); + ASSERT_IND("sgsn-0xaa", 6); + ASSERT_IND("sgsn-0xbb", 7); + ASSERT_IND("msc-0x2a", 8); + ASSERT_IND("msc-42", 3); + ASSERT_IND("sgsn-22", 4); + ASSERT_IND("msc-23", 1); + ASSERT_IND("sgsn-11", 2); + + IND_DEL("msc-0x17"); /* dropped IND == 5 */ + ASSERT_IND("msc-0x2a", 8); /* known CS remains where it is */ + ASSERT_IND("any-unknown", 9); /* new VLR takes a new IND from the end */ + + comment_end(); +} + static struct { bool verbose; } cmdline_opts = { @@ -998,6 +1042,7 @@ test_subscr_aud(); test_subscr_aud_invalid_len(); test_subscr_sqn(); + test_ind(); printf("Done\n"); db_close(dbc); diff --git a/tests/db/db_test.err b/tests/db/db_test.err index 871e722..ddf6d00 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -1613,3 +1613,83 @@ ===== test_subscr_sqn: SUCCESS + +===== test_ind +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-23\0" ind = 1 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-11\0" ind = 2 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-42\0" ind = 3 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-22\0" ind = 4 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-0x17\0" ind = 5 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-0xaa\0" ind = 6 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-42\0" ind = 3 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-22\0" ind = 4 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-0x17\0" ind = 5 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-0xaa\0" ind = 6 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-0xbb\0" ind = 7 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-0x2a\0" ind = 8 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-42\0" ind = 3 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-22\0" ind = 4 + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-23\0" ind = 1 + +db_ind(dbc, &vlr, &ind) --> 0 + +"sgsn-11\0" ind = 2 + +db_ind_del(dbc, &vlr) --> 0 + +"msc-0x17\0" ind deleted + +db_ind(dbc, &vlr, &ind) --> 0 + +"msc-0x2a\0" ind = 8 + +db_ind(dbc, &vlr, &ind) --> 0 + +"any-unknown\0" ind = 9 + +===== test_ind: SUCCESS + diff --git a/tests/db_upgrade/db_upgrade_test.ok b/tests/db_upgrade/db_upgrade_test.ok index 2bc6a39..0a45f7c 100644 --- a/tests/db_upgrade/db_upgrade_test.ok +++ b/tests/db_upgrade/db_upgrade_test.ok @@ -85,6 +85,7 @@ DDB Database test.db' has been upgraded to HLR DB schema version 3 DDB Database test.db' has been upgraded to HLR DB schema version 4 DDB Database test.db' has been upgraded to HLR DB schema version 5 +DDB Database test.db' has been upgraded to HLR DB schema version 6 DMAIN Cmdline option --db-check: Database was opened successfully, quitting. Resulting db: @@ -117,6 +118,13 @@ 5|5|44444444444444444444444444444444|44444444444444444444444444444444||0|5 5|5|55555555555555555555555555555555||55555555555555555555555555555555|0|6 +Table: ind +name|type|notnull|dflt_value|pk +ind|INTEGER|0||1 +vlr|TEXT|1||0 + +Table ind contents: + Table: subscriber name|type|notnull|dflt_value|pk ggsn_number|VARCHAR(15)|0||0 @@ -171,5 +179,5 @@ rc = 0 DMAIN hlr starting DDB using database: test.db -DDB Database test.db' has HLR DB schema version 5 +DDB Database test.db' has HLR DB schema version 6 DMAIN Cmdline option --db-check: Database was opened successfully, quitting. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:12:28 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:12:28 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 14: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 20:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 to look at the new patch set (#24). Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 536 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 to look at the new patch set (#14). Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 605 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#15). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 22 files changed, 2,005 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/15 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 to look at the new patch set (#6). Change subject: gsup_server: send routing error back to the correct peer ...................................................................... gsup_server: send routing error back to the correct peer If a peer attempts to add a route to an ipa-name that we already have in the routing system, don't send the routing error to the peer that already has the name, but to the peer that attempts to re-use it and would cause the collision. This is fixing a situation where for example a locally attached MSC has name 'MSC-1', and a remote site is proxying GSUP here for a remote MSC that also has the name 'MSC-1'. Send the routing error back to the proxy, not local 'MSC-1'. Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 --- M src/gsup_server.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/36/16336/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: hlr_vty_subscr: prettier output for last LU seen In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#24) to the change originally created by osmith. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16214 ) Change subject: hlr_vty_subscr: prettier output for last LU seen ...................................................................... hlr_vty_subscr: prettier output for last LU seen Extend the "last LU seen on ..." line with the amount of seconds that passed since now, or "(invalid timestamp)". Patch split from Id7fc50567211a0870ac0524f6dee94d4513781ba, because it depends on timestamp_age which was just added in Ife4a61d71926d08f310a1aeed9d9f1974f64178b. Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 --- M src/hlr_vty_subscr.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/16214/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 Gerrit-Change-Number: 16214 Gerrit-PatchSet: 24 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 to look at the new patch set (#28). Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... adoc: add D-GSM chapter to osmohlr-usermanual Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 --- A doc/manuals/chapters/dgsm.adoc M doc/manuals/osmohlr-usermanual.adoc 2 files changed, 483 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16211/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 to look at the new patch set (#28). Change subject: drop error log for when a subscriber does not exist ...................................................................... drop error log for when a subscriber does not exist Checking for existence of a subscriber and seeing that there is none is not inherently an error. However, osmo-hlr currently logs on all occasions: DAUC ERROR Cannot read subscriber from db: MSISDN='1001': No such subscriber This spams the ERROR log level. Particularly when a D-GSM setup does subscriber existence checks for every incoming mslookup request, that potentially creates constant ERROR logging. The "No such subscriber" part comes from db_sel(), which might also return an sqlite3_errmsg(). We still want those sqlite3_errmsg()es in the ERROR log. Hence print an ERROR log only if db_sel() returns an rc != -ENOENT. Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b --- M src/db_hlr.c M tests/db/db_test.err 2 files changed, 4 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/12/16212/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#18) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... vty: show subscriber: change format of 'last LU seen' So far, the time string format comes from ctime_r, and we manually add "UTC" to it. The ctime_r format is wildly chaotic IMHO, mixing weekday, day-of-month and hour and year in very unsorted ways. Adding "UTC" to it is non-standard. Instead use an ISO-8601 standardized time string via strftime(). Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a --- M src/hlr_vty_subscr.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/15359/18 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 18 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 to look at the new patch set (#14). Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds ...................................................................... vty: show subscriber: show lu d,h,m,s ago, not just seconds Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 --- M src/hlr_vty_subscr.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/62/16262/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 to look at the new patch set (#2). Change subject: auc3g: officially wrap IND around IND_bitlen space ...................................................................... auc3g: officially wrap IND around IND_bitlen space To determine distinct IND pools for each connected VLR, we need to pick ever increasing values for any new peer showing up. Each subscriber's individual IND_bitlen is then required to modulo the least significant N of bits that fit in its IND_bitlen to effectively round-robin in the available IND pool space. So far we did that but issued a warning message. This is actually exactly what we want and it doesn't need to be treated like it weren't so. Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e --- M src/db_auc.c 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/63/16763/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:44:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jan 2020 20:44:27 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 to look at the new patch set (#2). Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... db v6: determine 3G AUC IND from VLR name Each VLR requesting auth tuples should use a distinct IND pool for 3G auth. So far we tied the IND to the GSUP peer connection; MSC and SGSN were always distinct GSUP peers, they ended up using distinct INDs. However, we have implemented a GSUP proxy, so that, in a distributed setup, a remotely roaming subscriber has only one direct GSUP peer proxying for both remote MSC and SGSN. That means as soon as a subscriber roams to a different site, we would use the GSUP proxy name to determine the IND instead of the separate MSC and SGSN. The site's MSC and SGSN appear as the same client, get the same IND bucket, waste SQNs rapidly and cause auth tuple generation load. So instead of using the local client as IND, persistently keep a list of VLR names and assign a different IND to each. Use the gsup_req->source_name as indicator, which reflects the actual remote VLR's name (remote MSC or SGSN). Persist the site <-> IND assignments in the database. Add an IND test to db_test.c There was an earlier patch version that separated the IND pools by cn_domain, but it turned out to add complex semantics, while only solving one aspect of the "adjacent VLR" problem. We need a solution not only for CS vs PS, but also for 2,3G vs 4G, and for sites that are physically adjacent to each other. This patch version does not offer any automatic solution for that -- as soon as more than 2^IND_bitlen (usually 32) VLRs show up, it is the responsibility of the admin to ensure the 'ind' table in the hlr.db does not have unfortunate IND assignments. So far no VTY commands exist for that, they may be added in the future. Related: OS#4319 Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 --- M include/osmocom/hlr/db.h M sql/hlr.sql M src/db.c M src/db_hlr.c M src/gsupclient/gsup_peer_id.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err M tests/db_upgrade/db_upgrade_test.ok 9 files changed, 296 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/16764/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 20:57:06 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 7 Jan 2020 20:57:06 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 14: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c File src/mslookup_server_mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c at 152 PS14, Line 152: OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr)); SIGSEGV for me while configuring in the vty. Accessing g_hlr->mslookup.server.mdns.running->bind_addr after (!g_hlr->mslookup.server.mdns.running) ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 20:57:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:04:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:04:05 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c at 1415 PS3, Line 1415: sccp_scrc_rx_scoc_conn_msg(inst, xua); > why is this function called _rx_ and not _tx_ ? It's confusing. because the SCRC (SCCP Routing Control) receives a message We (SCOC) are transmitting, but SCRC is receiving. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:04:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:05:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:05:35 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... fix memleaks in mtp_user_prim_cb() After dispatching to scrc_rx_mtp_xfer_ind_xua(), free the xua_msg. Do not free the xua_msg in any of the code paths triggered within scrc_rx_mtp_xfer_ind_xua(), i.e. remove xua_msg_free() from: sccp_scoc_rx_from_scrc() +->sccp_scoc_rx_unass_local_ref() +->tx_coerr_from_xua() +->tx_relco_from_xua() Before this, some code paths would free the xua_msg, while most code paths would not, causing mem leaks. Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 --- M src/sccp_scoc.c M src/sccp_user.c 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 7570764..e2768ea 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1413,7 +1413,6 @@ /* sent to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); - xua_msg_free(xua); } /* Generate a RELCO based in input arguments */ @@ -1451,7 +1450,6 @@ /* send to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); - xua_msg_free(xua); } /* Generate a RLSD based in input arguments */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 929445f..49cc212 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,6 +174,7 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); + xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:07:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:07:08 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:07:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jan 7 22:07:21 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jan 2020 22:07:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e150121e5a04_49992ae64020460c32132@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 390s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 390s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 390s] dh_install -O--fail-missing [ 390s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 390s] dh_install: This feature will be removed in compat 12. [ 390s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 390s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 390s] dh_missing: missing files, aborting [ 390s] The following debhelper tools have reported what they installed (with files per package) [ 390s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 390s] If the missing files are installed by another tool, please file a bug against it. [ 390s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 390s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 390s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 390s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 390s] For a short-term work-around: Add the files to debian/not-installed [ 390s] dh_install: dh_missing --fail-missing returned exit code 255 [ 390s] make: *** [debian/rules:12: binary] Error 255 [ 390s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 391s] [ 391s] lamb14 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 22:07:03 UTC 2020. [ 391s] [ 391s] ### VM INTERACTION START ### [ 394s] [ 375.917530] sysrq: SysRq : Power Off [ 394s] [ 375.926616] reboot: Power down [ 394s] ### VM INTERACTION END ### [ 394s] [ 394s] lamb14 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 22:07:07 UTC 2020. [ 394s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:08:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:08:11 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:08:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:08:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:08:43 +0000 Subject: Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16206 ) Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() ...................................................................... Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:09:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:09:07 +0000 Subject: Change in osmo-hlr[master]: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16207 ) Change subject: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy ...................................................................... Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 Gerrit-Change-Number: 16207 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:09:24 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: remove cruft In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16460 ) Change subject: test_nodes.vty: remove cruft ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 Gerrit-Change-Number: 16460 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:09:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:09:54 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 24: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:10:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:10:57 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16336 ) Change subject: gsup_server: send routing error back to the correct peer ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:10:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:11:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:11:21 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:11:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:14:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:14:12 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist ...................................................................... Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:14:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:15:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:15:10 +0000 Subject: Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16763 ) Change subject: auc3g: officially wrap IND around IND_bitlen space ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:15:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:16:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:16:49 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:16:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:17:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 22:17:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/GSUP: make session ID for MT SS/USSD configurable References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 ) Change subject: MSC/GSUP: make session ID for MT SS/USSD configurable ...................................................................... MSC/GSUP: make session ID for MT SS/USSD configurable This would allow to run multiple SS/USSD transactions in parallel. Change-Id: I326b5e47f4c1e9f9209efa64c143c3dc64132edb --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/16765/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index eae5e56..c21bcd9 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -97,6 +97,7 @@ boolean mm_info, boolean sgsap_enable, boolean gsup_enable, + OCT4 gsup_sid, integer ran_idx, boolean use_umts_aka, boolean ran_is_geran, diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c2a5bbb..508acdd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -362,7 +362,7 @@ /* FIXME: move into BSC_ConnectionHandler? */ function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true, integer ran_idx := 0, - boolean ran_is_geran := true, boolean use_osmux := false) + boolean ran_is_geran := true, boolean use_osmux := false, OCT4 gsup_sid := '20000101'O) runs on MTC_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrNetworkPars net_pars := { kc_support := '0A'O, /* A5/1 and A5/3 enabled */ @@ -394,6 +394,7 @@ mm_info := mp_mm_info, sgsap_enable := sgsap, gsup_enable := gsup, + gsup_sid := gsup_sid, ran_idx := ran_idx, use_umts_aka := false, ran_is_geran := ran_is_geran, @@ -3009,7 +3010,7 @@ /* Compose HLR -> MSC GSUP message */ var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_BEGIN, ss := valueof(facility_req) ); @@ -3046,7 +3047,7 @@ /* Compose expected MSC -> HLR GSUP message */ var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_CONTINUE, ss := valueof(facility_rsp) ); @@ -3066,7 +3067,7 @@ /* Compose MSC -> HLR GSUP message */ var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_END ); @@ -3228,7 +3229,7 @@ /* Compose HLR -> MSC GSUP message */ var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_BEGIN, ss := valueof(facility_req) ); @@ -3248,7 +3249,7 @@ /* Compose expected MSC -> HLR GSUP message */ var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_CONTINUE, ss := valueof(facility_rsp) ); @@ -3267,7 +3268,7 @@ /* Compose MSC -> HLR GSUP message */ var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_END ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 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: I326b5e47f4c1e9f9209efa64c143c3dc64132edb Gerrit-Change-Number: 16765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:17:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 22:17:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 ) Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn ...................................................................... MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888 --- M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 2 files changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16766/1 diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index b80005e..586642b 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -422,6 +422,46 @@ f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0"); } +testcase TC_iu_mt_ussd_for_unknown_subscr() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_mt_ussd_for_unknown_subscr), 1052, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_mo_ussd_for_unknown_trans() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_mo_ussd_for_unknown_trans), 1053, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_for_unknown_session() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_for_unknown_session), 1055, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_paging_fail() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_paging_fail), 1056, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_abort() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_abort), 1057, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -476,6 +516,13 @@ execute( TC_iu_lu_and_mt_ussd_during_mt_call() ); execute( TC_iu_lu_and_mo_ussd_mo_release() ); execute( TC_iu_lu_and_ss_session_timeout() ); + + execute( TC_iu_mt_ussd_for_unknown_subscr() ); + execute( TC_iu_mo_ussd_for_unknown_trans() ); + execute( TC_iu_proc_ss_for_unknown_session() ); + execute( TC_iu_proc_ss_paging_fail() ); + execute( TC_iu_proc_ss_abort() ); + execute( TC_iu_lu_with_invalid_mcc_mnc() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ diff --git a/msc/expected-results.xml b/msc/expected-results.xml index f94c781..3a0749b 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -207,6 +207,11 @@ + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 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: I99e888708ed1efeab12a4c88c734a78619a39888 Gerrit-Change-Number: 16766 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:17:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 22:17:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... MSC: add test cases for concurrent MO/MT SS/USSD transactions Both test cases make use of the existing functions: - TC_multi_lu_and_mo_ussd: f_tc_lu_and_mo_ussd_single_request(), - TC_multi_lu_and_mt_ussd: f_tc_lu_and_mt_ussd_notification(), starting several (*) BSC_ConnHdlr components in parallel. (*) The maximum amount is limited by 8, and this limitation seems to be caused by size of GSUP_Emulation_CT.GsupExpectTable[], even despite SCCP_Emulation can handle twice more. Change-Id: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Related: OS#2931 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn 2 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/16767/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 508acdd..0319137 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3744,6 +3744,44 @@ } +/* Verify multiple concurrent MO SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_multi_lu_and_mo_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var integer i; + + f_init(); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i] := f_start_handler(refers(f_tc_lu_and_mo_ussd_single_request), 210 + i); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + +/* Verify multiple concurrent MT SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_multi_lu_and_mt_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var integer i; + var OCT4 sid; + + f_init(); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + sid := '200001'O & int2oct(i, 1); /* All transactions must use different session ID */ + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), + f_init_pars(220 + i, gsup_sid := sid)); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + + /* A5/1 only permitted on network side; attempt an invalid CIPHER MODE COMPLETE with A5/3 which MSC should reject. */ private function f_tc_cipher_complete_with_invalid_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { pars.net.expect_auth := true; @@ -5894,6 +5932,9 @@ execute( TC_proc_ss_paging_fail() ); execute( TC_proc_ss_abort() ); + execute( TC_multi_lu_and_mo_ussd() ); + execute( TC_multi_lu_and_mt_ussd() ); + execute( TC_cipher_complete_with_invalid_cipher() ); execute( TC_cipher_complete_1_without_cipher() ); execute( TC_cipher_complete_3_without_cipher() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 586642b..b6b0983 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -462,6 +462,45 @@ vc_conn.done; } +/* Verify multiple concurrent MO SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_iu_multi_lu_and_mo_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlrPars pars; + var integer i; + + f_init(3); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + pars := f_init_pars(1100 + i, ran_idx := 2, ran_is_geran := false); + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mo_ussd_single_request), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + +/* Verify multiple concurrent MT SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_iu_multi_lu_and_mt_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlrPars pars; + var integer i; + + f_init(3); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + pars := f_init_pars(1110 + i, ran_idx := 2, ran_is_geran := false, + gsup_sid := '200001'O & int2oct(i, 1)); + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -523,6 +562,9 @@ execute( TC_iu_proc_ss_paging_fail() ); execute( TC_iu_proc_ss_abort() ); + execute( TC_iu_multi_lu_and_mo_ussd() ); + execute( TC_iu_multi_lu_and_mt_ussd() ); + execute( TC_iu_lu_with_invalid_mcc_mnc() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:18:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:18:24 +0000 Subject: Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:18:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:18:30 +0000 Subject: Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST ...................................................................... add crcXXgen.c.tpl to EXTRA_DIST 'make distcheck' distributes the generated .c files, but it is good GPL practice to also distribute the template. Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 --- M Makefile.am M src/Makefile.am 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 7390f98..d08f41b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \ $(top_srcdir)/include/osmocom/core/*.h \ $(top_srcdir)/src/*.[hc] \ + $(top_srcdir)/src/crcXXgen.c.tpl \ $(top_srcdir)/src/pseudotalloc/*.[hc] rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core rm -rf $(top_builddir)/doc/libosmocore.map diff --git a/src/Makefile.am b/src/Makefile.am index 34cda0f..16119d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ endif BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c -EXTRA_DIST = conv_acc_sse_impl.h +EXTRA_DIST = conv_acc_sse_impl.h crcXXgen.c.tpl libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:18:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:18:52 +0000 Subject: Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16756 ) Change subject: jenkins.sh: simpler invocation of verify_value_string_... ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 Gerrit-Change-Number: 16756 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:18:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:18:56 +0000 Subject: Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16756 ) Change subject: jenkins.sh: simpler invocation of verify_value_string_... ...................................................................... jenkins.sh: simpler invocation of verify_value_string_... The script osmo-ci/scripts/verify_value_string_arrays_are_terminated.py is able to find .c/.h files in directory trees by itself. Shorten the cmdline invocation of this script for libosmocore. Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 --- M contrib/jenkins_common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index fa1d544..b86a479 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -10,7 +10,7 @@ osmo-clean-workspace.sh -verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") +verify_value_string_arrays_are_terminated.py prep_build() { _src_dir="$1" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 Gerrit-Change-Number: 16756 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:19:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:19:16 +0000 Subject: Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16757 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 Gerrit-Change-Number: 16757 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:19:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:19:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:19:18 +0000 Subject: Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16757 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 --- M src/e1_input.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1_input.c b/src/e1_input.c index eb973ef..9e2f7b0 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #define NUM_E1_TS 32 @@ -115,12 +116,19 @@ } __attribute__((packed)); struct lapd_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ea1 : 1; uint8_t cr : 1; uint8_t sapi : 6; uint8_t ea2 : 1; uint8_t tei : 7; uint8_t control_foo; /* fake UM's ... */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t sapi:6, cr:1, ea1:1; + uint8_t tei:7, ea2:1; + uint8_t control_foo; +#endif } __attribute__((packed)); osmo_static_assert(offsetof(struct fake_linux_lapd_header, hatype) == 2, hatype_offset); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 Gerrit-Change-Number: 16757 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:19:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:19:30 +0000 Subject: Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:19:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:19:33 +0000 Subject: Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part ...................................................................... struct amr_header: copy comments to little endian part I will soon apply struct_endianess.py to this code, and then the comments that are now only in the big endian part would be lost. Copy them to preserve them. Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a --- M include/osmocom/netif/amr.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 46ec86a..729d0ae 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -55,12 +55,12 @@ #elif OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, - cmr:4; + cmr:4; /* Codec Mode Request */ /* Table of Contents */ uint8_t pad2:2, - q:1, - ft:4, - f:1; + q:1, /* OK (not damaged) at origin? */ + ft:4, /* coding mode */ + f:1; /* followed by another speech frame? */ #endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:20:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:20:28 +0000 Subject: Change in libosmo-sccp[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 1: does it actually change anything? I couldn't spot anything. If so: Should be marked as cosmetic. Or not bother at all? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd Gerrit-Change-Number: 16761 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:20:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:21:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:21:30 +0000 Subject: Change in osmo-trx[master]: lms: Drop unused define In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:21:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:21:49 +0000 Subject: Change in osmo-trx[master]: lms: Move initialization of field started to constructor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16753 ) Change subject: lms: Move initialization of field started to constructor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad Gerrit-Change-Number: 16753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:21:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:22:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:22:57 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:22:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:23:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:23:37 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:23:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:24:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:24:11 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:24:37 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:24:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:24:49 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:01 +0000 Subject: Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends ...................................................................... Make logging category DLMS generic and reusable for other backends Make sure old configs using "logging level lms " are still accepted. Initialization order of VTY componenets need to be resorted since newly introduced command requires logging VTY node to be already setup beforehand. Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e --- M CommonLibs/debug.c M CommonLibs/debug.h M CommonLibs/trx_vty.c M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/osmo-trx.cpp 5 files changed, 9 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index cc5be44..c227435 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -65,9 +65,9 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_INFO, }, - [DLMS] = { - .name = "DLMS", - .description = "Logging from within LimeSuite itself", + [DDEVDRV] = { + .name = "DDEVDRV", + .description = "Logging from external device driver library implementing lower level specifics", .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 3837329..0dca2ee 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -15,7 +15,7 @@ DTRXDDL, DTRXDUL, DDEV, - DLMS, + DDEVDRV, }; #define CLOGC(category, level, fmt, args...) do { \ diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 02d6572..44e1d31 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -731,5 +732,7 @@ install_element(CHAN_NODE, &cfg_chan_rx_path_cmd); install_element(CHAN_NODE, &cfg_chan_tx_path_cmd); + logging_vty_add_deprecated_subsys(g_trx_ctx, "lms"); + return 0; } diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b5993b8..19fe6e8 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -93,7 +93,7 @@ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) lvl = ARRAY_SIZE(lvl_map)-1; - LOGLV(DLMS, lvl_map[lvl]) << msg; + LOGLV(DDEVDRV, lvl_map[lvl]) << msg; } static void print_range(const char* name, lms_range_t *range) diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 16047a9..0ad60ef 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -588,10 +588,10 @@ log_enable_multithread(); osmo_stats_init(tall_trx_ctx); vty_init(&g_vty_info); + logging_vty_add_cmds(); ctrl_vty_init(tall_trx_ctx); trx_vty_init(g_trx_ctx); - logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:01 +0000 Subject: Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework ...................................................................... uhd: Use DEVDRV log category and support UHD >=3.11 logging framework Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 --- M CommonLibs/Logger.h M Transceiver52M/device/uhd/UHDDevice.cpp 2 files changed, 51 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h index ab72303..b752e51 100644 --- a/CommonLibs/Logger.h +++ b/CommonLibs/Logger.h @@ -58,6 +58,9 @@ #define LOGLV(category, level) \ Log(category, level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] " +#define LOGSRC(category, level, file, line) \ + Log(category, level, file, line).get() << "[tid=" << pthread_self() << "] " + #define LOGCHAN(chan, category, level) \ Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "][chan=" << chan << "] " diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 59eb8a7..4a6c233 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -33,11 +33,12 @@ #include "config.h" #endif -#ifndef USE_UHD_3_11 +#ifdef USE_UHD_3_11 +#include +#include +#else #include #include -#else -#include #endif #define USRP_TX_AMPL 0.3 @@ -134,23 +135,52 @@ return NULL; } -#ifndef USE_UHD_3_11 +#ifdef USE_UHD_3_11 +static void uhd_log_handler(const uhd::log::logging_info &info) +{ + int level; + + switch (info.verbosity) + { + case uhd::log::trace: + case uhd::log::debug: + level = LOGL_DEBUG; + break; + case uhd::log::info: + level = LOGL_INFO; + break; + case uhd::log::warning: + level = LOGL_NOTICE; + break; + case uhd::log::error: + level = LOGL_ERROR; + break; + case uhd::log::fatal: + level = LOGL_FATAL; + break; + default: + level = LOGL_NOTICE; + } + + LOGSRC(DDEVDRV, level, info.file.c_str(), info.line) << "[" << info.component << "] " << info.message; +} +#else /* Catch and drop underrun 'U' and overrun 'O' messages from stdout since we already report using the logging facility. Direct everything else appropriately. */ -void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg) +static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg) { switch (type) { case uhd::msg::status: - LOGC(DDEV, INFO) << msg; + LOGC(DDEVDRV, INFO) << msg; break; case uhd::msg::warning: - LOGC(DDEV, WARNING) << msg; + LOGC(DDEVDRV, NOTICE) << msg; break; case uhd::msg::error: - LOGC(DDEV, ERROR) << msg; + LOGC(DDEVDRV, ERROR) << msg; break; case uhd::msg::fastpath: break; @@ -418,6 +448,16 @@ { const char *refstr; + /* Register msg handler. Different APIs depending on UHD version */ +#ifdef USE_UHD_3_11 + uhd::log::add_logger("OsmoTRX", &uhd_log_handler); + uhd::log::set_log_level(uhd::log::debug); + uhd::log::set_console_level(uhd::log::off); + uhd::log::set_logger_level("OsmoTRX", uhd::log::debug); +#else + uhd::msg::register_handler(&uhd_msg_handler); +#endif + // Find UHD devices uhd::device_addr_t addr(args); uhd::device_addrs_t dev_addrs = uhd::device::find(addr); @@ -604,10 +644,6 @@ return false; } -#ifndef USE_UHD_3_11 - // Register msg handler - uhd::msg::register_handler(&uhd_msg_handler); -#endif // Start asynchronous event (underrun check) loop async_event_thrd = new Thread(); async_event_thrd->start((void * (*)(void*))async_event_loop, (void*)this); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:01 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... uhd: Improve some logging lines printing UHD pretty-print output Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 4a6c233..8bab882 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -566,7 +566,7 @@ init_gains(); // Print configuration - LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string(); + LOGC(DDEV, INFO) << "Device configuration: " << usrp_dev->get_pp_string(); if (iface == MULTI_ARFCN) return MULTI_ARFCN; @@ -919,15 +919,18 @@ std::vector freqs; uhd::tune_result_t tres; uhd::tune_request_t treq = select_freq(freq, chan, tx); + std::string str_dir; if (tx) { tres = usrp_dev->set_tx_freq(treq, chan); tx_freqs[chan] = usrp_dev->get_tx_freq(chan); + str_dir = "Tx"; } else { tres = usrp_dev->set_rx_freq(treq, chan); rx_freqs[chan] = usrp_dev->get_rx_freq(chan); + str_dir = "Rx"; } - LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl; if ((chans == 1) || ((chans == 2) && dev_type == UMTRX)) return true; @@ -947,7 +950,7 @@ rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan); } - LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl; } return true; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:02 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... doc: clarify number of channels on B210 with multi-arfcn enabled Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c --- M doc/manuals/chapters/configuration.adoc 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2f4986f..a194537 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -46,15 +46,16 @@ added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. This feature is useful for instance if you want to run more than 1 TRX with an -Ettus B200 device, or 2 TRX with an Ettus B210 device, since they support only 1 -and 2 physical RF channels respectively. No device from other providers or even -other devices than B200 and B210 from Ettus are known to support this feature. +Ettus B200 device, or more than 2 TRXs with an Ettus B210 device, since they +support only 1 and 2 physical RF channels respectively. No device from other +providers or even other devices than B200 and B210 from Ettus are known to +support this feature. With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to three ARFCN's is supported for multi-TRX. -From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN +From BTS and BSC point of view, supporting multiple TRXs through multi-ARFCN feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, leaving apart of course the mentioned ARFCN limitations explained above and as a consequence physical installation and operational differences. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:02 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions multi-arfcn feature uses a hardcoded disposition of logical channels on a physical channel. Logical channels in the phisical channel are separated by MCBTS_SPACING Hz, that is 4 GSM ARFCNs. As a result, multi-arfcn restricts the TRX ARFCN setup to the following: ARFCN(TRX0)=N, ARFCN(TRX1)=N+1*4, ARFCN(TRX2)=N+2*4, ... Let's make sure radioInterfaceMulti verifies the requested Rx/Tx frequencies for each logical channel over TRXC match the restriction explained above. It will check freq going to be set is indeed separated by MCBTS_SPACING from already set channels, making sure the ARFCN series is consistent. Otherwise, before this patch, one could set in osmo-bsc: ARFCN(TRX0)=N, ARFCN(TRX1)=N+2 and osmo-trx would silently ack the related Rx/TxTUNE TRXC commands, but actually still transmit on ARFCN N+4 instead. As a result, in this scenario TRX!=0 were unusable with multi-arfcn. Related: OS#4207 Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f --- M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 2 files changed, 59 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index d9fa414..c75a983 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -156,16 +156,24 @@ void close(); }; +struct freq_cfg_state { + bool set; + double freq_hz; +}; + class RadioInterfaceMulti : public RadioInterface { private: bool pushBuffer(); int pullBuffer(); + bool verify_arfcn_consistency(double freq, size_t chan, bool tx); virtual double setTxGain(double dB, size_t chan); signalVector *outerSendBuffer; signalVector *outerRecvBuffer; std::vector history; std::vector active; + std::vector rx_freq_state; + std::vector tx_freq_state; Resampler *dnsampler; Resampler *upsampler; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 668305c..a0c24b5 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -73,6 +73,8 @@ powerScaling.resize(0); history.resize(0); active.resize(0); + rx_freq_state.resize(0); + tx_freq_state.resize(0); RadioInterface::close(); } @@ -148,6 +150,8 @@ mReceiveFIFO.resize(mChans); powerScaling.resize(mChans); history.resize(mChans); + rx_freq_state.resize(mChans); + tx_freq_state.resize(mChans); active.resize(MCHANS, false); inchunk = RESAMP_INRATE * 4; @@ -362,42 +366,67 @@ return fabs(a - b) < FREQ_DELTA_LIMIT ? true : false; } +bool RadioInterfaceMulti::verify_arfcn_consistency(double freq, size_t chan, bool tx) +{ + double freq_i; + std::string str_dir = tx ? "Tx" : "Rx"; + std::vector &v = tx ? tx_freq_state : rx_freq_state; + + for (size_t i = 0; i < mChans; i++) { + if (i == chan) + continue; + if (!v[i].set) + continue; + + freq_i = v[i].freq_hz + (double) ((int)chan - (int)i) * MCBTS_SPACING; + if (!fltcmp(freq, freq_i)) { + LOGCHAN(chan, DMAIN, ERROR) + << "Setting " << str_dir << " frequency " << freq + << " is incompatible: already configured channel " + << i << " uses frequency " << v[i].freq_hz + << " (expected " << freq_i << ")"; + return false; + } + } + v[chan].set = true; + v[chan].freq_hz = freq; + return true; +} + bool RadioInterfaceMulti::tuneTx(double freq, size_t chan) { - if (chan >= mChans) - return false; + double shift; - double shift = (double) getFreqShift(mChans); + if (chan >= mChans) + return false; - if (!chan) - return mDevice->setTxFreq(freq + shift * MCBTS_SPACING); + if (!verify_arfcn_consistency(freq, chan, true)) + return false; - double center = mDevice->getTxFreq(); - if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { - LOG(NOTICE) << "Channel " << chan << " RF Tx frequency offset is " - << freq / 1e6 << " MHz"; - } + if (chan == 0) { + shift = (double) getFreqShift(mChans); + return mDevice->setTxFreq(freq + shift * MCBTS_SPACING); + } - return true; + return true; } bool RadioInterfaceMulti::tuneRx(double freq, size_t chan) { - if (chan >= mChans) - return false; + double shift; - double shift = (double) getFreqShift(mChans); + if (chan >= mChans) + return false; - if (!chan) - return mDevice->setRxFreq(freq + shift * MCBTS_SPACING); + if (!verify_arfcn_consistency(freq, chan, false)) + return false; - double center = mDevice->getRxFreq(); - if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { - LOG(NOTICE) << "Channel " << chan << " RF Rx frequency offset is " - << freq / 1e6 << " MHz"; - } + if (chan == 0) { + shift = (double) getFreqShift(mChans); + return mDevice->setRxFreq(freq + shift * MCBTS_SPACING); + } - return true; + return true; } double RadioInterfaceMulti::setRxGain(double db, size_t chan) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:02 +0000 Subject: Change in osmo-trx[master]: doc: Update vty reference xml file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16699 ) Change subject: doc: Update vty reference xml file ...................................................................... doc: Update vty reference xml file Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 --- M doc/manuals/vty/trx_vty_reference.xml 1 file changed, 135 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index 8738235..ff44078 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -18,10 +18,11 @@ - + + @@ -96,12 +97,6 @@ - - - - - - @@ -193,14 +188,17 @@ - + + + + - + @@ -259,6 +257,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,6 +307,12 @@ + + + + + + @@ -415,12 +456,6 @@ - - - - - - @@ -512,14 +547,17 @@ - + + + + - + @@ -578,6 +616,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -591,6 +666,12 @@ + + + + + + @@ -772,16 +853,6 @@ - - - - - - - - - - @@ -861,6 +932,16 @@ + + + + + + + + + + @@ -973,14 +1054,17 @@ - + + + + - + @@ -1179,20 +1263,6 @@ - - - - - - - - - - - - - - @@ -1247,10 +1317,29 @@ - + - - + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 Gerrit-Change-Number: 16699 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:03 +0000 Subject: Change in osmo-trx[master]: lms: Move initialization of field started to constructor In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16753 ) Change subject: lms: Move initialization of field started to constructor ...................................................................... lms: Move initialization of field started to constructor Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 19fe6e8..4a687e1 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -49,7 +49,7 @@ const std::vector& tx_paths, const std::vector& rx_paths): RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), - m_lms_dev(NULL) + m_lms_dev(NULL), started(false) { LOGC(DDEV, INFO) << "creating LMS device..."; @@ -248,8 +248,6 @@ for (size_t i = 0; i < rx_buffers.size(); i++) rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); - started = false; - return NORMAL; out_close: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad Gerrit-Change-Number: 16753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:04 +0000 Subject: Change in osmo-trx[master]: lms: Drop unused define In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define ...................................................................... lms: Drop unused define Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 4a687e1..b8893fb 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -39,7 +39,6 @@ using namespace std; #define MAX_ANTENNA_LIST_SIZE 10 -#define LMS_SAMPLE_RATE GSMRATE*32 #define GSM_CARRIER_BW 270000.0 /* 270kHz */ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:25:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:25:56 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:25:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:26:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:26:01 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members ...................................................................... l1sap: add measurement related struct members In order to dissolve info_meas_ind_param in ph_data_param and ph_tch_param we need to add the measurement related struct members to ph_data_param and ph_tch_param as well so that those indications can also carry measurement data. Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Related: OS#2977 --- M TODO-RELEASE M include/osmocom/gsm/l1sap.h 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..329e217 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +gsm API/ABI change l1sap.h, added struct members to ph_data_param and ph_tch_param \ No newline at end of file diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index 3d2ad25..11b2773 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -84,6 +84,7 @@ }; int16_t lqual_cb; /*!< Link quality in centiBel */ enum osmo_ph_pres_info_type pdch_presence_info; /*!< Info regarding presence/validity of header and data parts */ + uint8_t is_sub:1; /*!< flags */ }; /*! for TCH.{req,ind} | TCH-RTS.ind */ @@ -94,6 +95,8 @@ uint8_t marker; /*!< RTP Marker bit (speech onset indicator) */ uint16_t ber10k; /*!< BER in units of 0.01% */ int16_t lqual_cb; /*!< Link quality in centiBel */ + int16_t ta_offs_256bits;/*!< timing advance offset (in 1/256th bits) */ + uint8_t is_sub:1; /*!< flags */ }; /*! for PH-CONN.ind */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:27:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jan 2020 22:27:53 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > what about something bogus like "afblud" (application for boot loader update via dfu)? > > I find afblud also very cryptic, but I agree that the firmware names are not super clear for uninitiated users. > just flashing the DFU application using the DFU bootloader so to updated the bootloader using DFU is complicated enough to parse. > instead I think we just need to provide a script taking care of updating everything. this will hide all the details and avoid confusion and mistakes. > thus I don't think renaming is necessary, but I don't mind. > instead of renaming the DFU "app" (since it's the same for the bootloader or application), I would just rename the final binary in the Makefile. I still think its best to rename. Doesn't have my stupid proposal, though. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tsaitgaist Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:27:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:32:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 22:32:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 to look at the new patch set (#2). Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn ...................................................................... MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888 --- M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 2 files changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16766/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 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: I99e888708ed1efeab12a4c88c734a78619a39888 Gerrit-Change-Number: 16766 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 7 22:33:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jan 2020 22:33:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:33:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jan 8 01:50:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jan 2020 01:50:30 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1535848800c_49992ae64020460c356220@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Testing/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 102s] [224/391] installing gcc-8-8.3.0-26 [ 104s] [225/391] installing gcc-9-9.2.1-22 [ 106s] [226/391] installing debconf-1.5.73 [ 107s] [227/391] installing init-system-helpers-1.57 [ 107s] [228/391] installing libboost-numpy-dev-1.67.0.2 [ 107s] [229/391] installing libboost1.67-dev-1.67.0-13+b1 [ 112s] [230/391] installing gcc-4:9.2.1-3.1 [ 112s] [231/391] installing perl-modules-5.30-5.30.0-9 [ 113s] [232/391] installing libreadline8-8.0-3 [ 114s] Processing triggers for libc-bin (2.29-7) ... [ 114s] [233/391] installing libxnvctrl0-430.64-1 [ 114s] Processing triggers for libc-bin (2.29-7) ... [ 114s] [234/391] installing python-minimal-2.7.17-2 [ 114s] [235/391] installing doxygen-1.8.16-1 [ 116s] [236/391] installing gettext-0.19.8.1-10 [ 117s] Processing triggers for libc-bin (2.29-7) ... [ 117s] [237/391] installing g++-9-9.2.1-22 [ 119s] /.build/build-pkg-deb: line 42: 5580 Segmentation fault (core dumped) DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot $* [ 119s] exit ... [ 119s] [ 119s] lamb56 failed "build libusrp_3.4.4.1.45c0.dsc" at Wed Jan 8 01:50:12 UTC 2020. [ 119s] [ 119s] ### VM INTERACTION START ### [ 122s] [ 99.845977] sysrq: SysRq : Power Off [ 122s] [ 99.883198] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb56 failed "build libusrp_3.4.4.1.45c0.dsc" at Wed Jan 8 01:50:16 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:10:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:10:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/GSUP: make session ID for MT SS/USSD configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 ) Change subject: MSC/GSUP: make session ID for MT SS/USSD configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 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: I326b5e47f4c1e9f9209efa64c143c3dc64132edb Gerrit-Change-Number: 16765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jan 2020 11:10:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:10:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:10:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 ) Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 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: I99e888708ed1efeab12a4c88c734a78619a39888 Gerrit-Change-Number: 16766 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jan 2020 11:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:12:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:12:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767/2//COMMIT_MSG at 16 PS2, Line 16: (*) The maximum amount is limited by 8, and this limitation seems : to be caused by size of GSUP_Emulation_CT.GsupExpectTable[], : even despite SCCP_Emulation can handle twice more. you can simply chane the constaant, if you'd like. In general an "expect" is only needed as long as the connection is not establishd yet. So you can have a maximum of 8 expected/pending SCCP connections at any time, but you should very well be able to have mor connections in established mode. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jan 2020 11:12:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:12:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:12:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/GSUP: make session ID for MT SS/USSD configurable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 ) Change subject: MSC/GSUP: make session ID for MT SS/USSD configurable ...................................................................... MSC/GSUP: make session ID for MT SS/USSD configurable This would allow to run multiple SS/USSD transactions in parallel. Change-Id: I326b5e47f4c1e9f9209efa64c143c3dc64132edb --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index eae5e56..c21bcd9 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -97,6 +97,7 @@ boolean mm_info, boolean sgsap_enable, boolean gsup_enable, + OCT4 gsup_sid, integer ran_idx, boolean use_umts_aka, boolean ran_is_geran, diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c2a5bbb..508acdd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -362,7 +362,7 @@ /* FIXME: move into BSC_ConnectionHandler? */ function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true, integer ran_idx := 0, - boolean ran_is_geran := true, boolean use_osmux := false) + boolean ran_is_geran := true, boolean use_osmux := false, OCT4 gsup_sid := '20000101'O) runs on MTC_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrNetworkPars net_pars := { kc_support := '0A'O, /* A5/1 and A5/3 enabled */ @@ -394,6 +394,7 @@ mm_info := mp_mm_info, sgsap_enable := sgsap, gsup_enable := gsup, + gsup_sid := gsup_sid, ran_idx := ran_idx, use_umts_aka := false, ran_is_geran := ran_is_geran, @@ -3009,7 +3010,7 @@ /* Compose HLR -> MSC GSUP message */ var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_BEGIN, ss := valueof(facility_req) ); @@ -3046,7 +3047,7 @@ /* Compose expected MSC -> HLR GSUP message */ var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_CONTINUE, ss := valueof(facility_rsp) ); @@ -3066,7 +3067,7 @@ /* Compose MSC -> HLR GSUP message */ var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_END ); @@ -3228,7 +3229,7 @@ /* Compose HLR -> MSC GSUP message */ var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_BEGIN, ss := valueof(facility_req) ); @@ -3248,7 +3249,7 @@ /* Compose expected MSC -> HLR GSUP message */ var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_CONTINUE, ss := valueof(facility_rsp) ); @@ -3267,7 +3268,7 @@ /* Compose MSC -> HLR GSUP message */ var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ( imsi := g_pars.imsi, - sid := '20000101'O, + sid := g_pars.gsup_sid, state := OSMO_GSUP_SESSION_STATE_END ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 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: I326b5e47f4c1e9f9209efa64c143c3dc64132edb Gerrit-Change-Number: 16765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:12:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:12:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 ) Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn ...................................................................... MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888 --- M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 2 files changed, 52 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index b80005e..586642b 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -422,6 +422,46 @@ f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0"); } +testcase TC_iu_mt_ussd_for_unknown_subscr() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_mt_ussd_for_unknown_subscr), 1052, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_mo_ussd_for_unknown_trans() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_mo_ussd_for_unknown_trans), 1053, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_for_unknown_session() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_for_unknown_session), 1055, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_paging_fail() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_paging_fail), 1056, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + +testcase TC_iu_proc_ss_abort() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_proc_ss_abort), 1057, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -476,6 +516,13 @@ execute( TC_iu_lu_and_mt_ussd_during_mt_call() ); execute( TC_iu_lu_and_mo_ussd_mo_release() ); execute( TC_iu_lu_and_ss_session_timeout() ); + + execute( TC_iu_mt_ussd_for_unknown_subscr() ); + execute( TC_iu_mo_ussd_for_unknown_trans() ); + execute( TC_iu_proc_ss_for_unknown_session() ); + execute( TC_iu_proc_ss_paging_fail() ); + execute( TC_iu_proc_ss_abort() ); + execute( TC_iu_lu_with_invalid_mcc_mnc() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ diff --git a/msc/expected-results.xml b/msc/expected-results.xml index f94c781..a7b7142 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -207,6 +207,11 @@ + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 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: I99e888708ed1efeab12a4c88c734a78619a39888 Gerrit-Change-Number: 16766 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:17:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:17:56 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c at 735 PS7, Line 735: if (!gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) : process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); we sould probably print an error message here (once? rate-limited)? Or even have an OSMO_ASSERT()? It's a claar programming bug: Either you have FEAT_MEAS_PAYLOAD_COMB *or* you send PRIM_INFO_MEAS up the stack... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 11:17:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:19:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:19:02 +0000 Subject: Change in simtrace2[master]: library: Add osmo_st2_compatible_dev_idsp[] In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16680 ) Change subject: library: Add osmo_st2_compatible_dev_idsp[] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc Gerrit-Change-Number: 16680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jan 2020 11:19:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:19:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jan 2020 11:19:05 +0000 Subject: Change in simtrace2[master]: library: Add osmo_st2_compatible_dev_idsp[] In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16680 ) Change subject: library: Add osmo_st2_compatible_dev_idsp[] ...................................................................... library: Add osmo_st2_compatible_dev_idsp[] This is a list of known-compatible USB VID/PID pairs. Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc --- M host/include/Makefile.am A host/include/osmocom/simtrace2/usb_util.h M host/lib/Makefile.am A host/lib/usb_util.c 4 files changed, 47 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/include/Makefile.am b/host/include/Makefile.am index b7b453a..60134f3 100644 --- a/host/include/Makefile.am +++ b/host/include/Makefile.am @@ -3,4 +3,6 @@ osmocom/simtrace2/simtrace2_api.h \ osmocom/simtrace2/simtrace_usb.h \ osmocom/simtrace2/simtrace_prot.h \ - osmocom/simtrace2/gsmtap.h + osmocom/simtrace2/usb_util.h \ + osmocom/simtrace2/gsmtap.h \ + $(NULL) diff --git a/host/include/osmocom/simtrace2/usb_util.h b/host/include/osmocom/simtrace2/usb_util.h new file mode 100644 index 0000000..3bb2486 --- /dev/null +++ b/host/include/osmocom/simtrace2/usb_util.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +extern const struct dev_id osmo_st2_compatible_dev_ids[]; diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am index 438ad9d..3f7ec8e 100644 --- a/host/lib/Makefile.am +++ b/host/lib/Makefile.am @@ -15,4 +15,6 @@ libosmo_simtrace2_la_SOURCES = \ apdu_dispatch.c \ gsmtap.c \ - simtrace2_api.c + simtrace2_api.c \ + usb_util.c \ + $(NULL) diff --git a/host/lib/usb_util.c b/host/lib/usb_util.c new file mode 100644 index 0000000..7599991 --- /dev/null +++ b/host/lib/usb_util.c @@ -0,0 +1,36 @@ +/* usb_util - USB related utilities for SIMtrace 2 USB devices + * + * (C) 2016-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include +#include +#include +#include +#include + +#include + +#include +#include + +/*! list of USB idVendor/idProduct tuples of devices using simtrace2 firmware */ +const struct dev_id osmo_st2_compatible_dev_ids[] = { + { USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 }, + { USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 }, + { USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 }, + { 0, 0 } +}; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc Gerrit-Change-Number: 16680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:44:56 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 8 Jan 2020 11:44:56 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16256/11/src/mslookup/mdns_sock.c File src/mslookup/mdns_sock.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16256/11/src/mslookup/mdns_sock.c at 129 PS11, Line 129: int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) I think it might be an idea to optionally put this on the wire more than once, based on a configuration option, or per request flag. I'm not sure if this is the place, or what the best practice is for such a thing. with for example. delay between sending -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: keith Gerrit-Comment-Date: Wed, 08 Jan 2020 11:44:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 11:52:49 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 8 Jan 2020 11:52:49 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#8). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 126 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jan 8 12:09:19 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jan 2020 12:09:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e15c68ab03da_12e32ae013cea5f41430f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 432s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 432s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 432s] dh_install -O--fail-missing [ 432s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 432s] dh_install: This feature will be removed in compat 12. [ 432s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 432s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 432s] dh_missing: missing files, aborting [ 432s] The following debhelper tools have reported what they installed (with files per package) [ 432s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 432s] If the missing files are installed by another tool, please file a bug against it. [ 432s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 432s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 432s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 432s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 432s] For a short-term work-around: Add the files to debian/not-installed [ 432s] dh_install: dh_missing --fail-missing returned exit code 255 [ 432s] make: *** [debian/rules:12: binary] Error 255 [ 432s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 432s] [ 432s] lamb17 failed "build osmo-remsim_0.2.2.dsc" at Wed Jan 8 12:09:02 UTC 2020. [ 432s] [ 432s] ### VM INTERACTION START ### [ 435s] [ 414.690546] sysrq: SysRq : Power Off [ 435s] [ 414.695955] reboot: Power down [ 435s] ### VM INTERACTION END ### [ 435s] [ 435s] lamb17 failed "build osmo-remsim_0.2.2.dsc" at Wed Jan 8 12:09:05 UTC 2020. [ 435s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jan 8 12:26:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 12:26:45 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 12:26:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 12:33:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 12:33:29 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Wed, 08 Jan 2020 12:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 12:38:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 12:38:37 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... Patch Set 22: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 12:38:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 12:42:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 12:42:55 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 22: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 12:42:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 12:46:38 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 8 Jan 2020 12:46:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: skip tests that need PCU socket access In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 ) Change subject: BTS_Tests: skip tests that need PCU socket access ...................................................................... Patch Set 4: (2 comments) This change is ready for review. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748/2//COMMIT_MSG at 11 PS2, Line 11: pci > typo: PCU Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748/2//COMMIT_MSG at 13 PS2, Line 13: direkt > direct Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 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: I735b85d2ff3f541ebf0a558735d6172d69e7c29f Gerrit-Change-Number: 13748 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 12:46:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:14:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:14:29 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: (7 comments) IMHO too many things going on in this commit which are not really related and which could have been easily splitted and discussed separately, like the use of ipa_name struct, te _req*, and other fixes in the way simply pulled in in the same patch. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/gsupclient/ipa_name.h File include/osmocom/gsupclient/ipa_name.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/gsupclient/ipa_name.h at 29 PS23, Line 29: struct osmo_ipa_name { I'm not really liking this kind of adhoc structures to keep a string specially since they are presented in a public header of shared library, meaning we'll need to keep with it later on... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/hlr/gsup_router.h File include/osmocom/hlr/gsup_router.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/hlr/gsup_router.h at 31 PS23, Line 31: int osmo_gsup_send_to_ipa_name(struct osmo_gsup_server *gs, const struct osmo_ipa_name *ipa_name, struct msgb *msg); Update TODO_RELEASE explaining there's new API. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c File src/db.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c at 25 PS23, Line 25: #include Non related at all, must go into a separate patch (if needed at all). https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsup_router.c File src/gsup_router.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsup_router.c at 99 PS23, Line 99: int gsup_route_add_ipa_name(struct osmo_gsup_conn *conn, const struct osmo_ipa_name *ipa_name) and with this type of structs we end up doing like this function, simply adding extra layers. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c File src/gsupclient/ipa_name.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c at 90 PS23, Line 90: return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); So you are forcing the app using the library to enable the otc_select in this case? SHouldn't the function have some kind of suffix to mark it as so (_c) and explain that in the API doc? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c at 426 PS23, Line 426: osmo_gsup_message_type_name((gsup)->message_type), \ Fixing () in the define could be a separate commit. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c at 777 PS23, Line 777: osmo_select_main_ctx(0); Is this line change only needed to print stuff more easily? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:14:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:16:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jan 2020 13:16:16 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 8: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c at 198 PS8, Line 198: *rssi_sum / *rssi_num This is a TX burst handler, so there can be no RSSI measurements. Most likely you would get division by zero. https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c at 398 PS8, Line 398: toa256 = *toa256_sum / *toa_num; Same here, it's a TX handler and it has no Uplink measurements in its state. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:16:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:21:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jan 2020 13:21:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: skip tests that need PCU socket access In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 ) Change subject: BTS_Tests: skip tests that need PCU socket access ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 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: I735b85d2ff3f541ebf0a558735d6172d69e7c29f Gerrit-Change-Number: 13748 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:24:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:24:25 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_peer_id.h File include/osmocom/gsupclient/gsup_peer_id.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_peer_id.h at 30 PS3, Line 30: struct osmo_ipa_name { So it is added in previous commit, then in this one it's moved to a new header while adding a new osmo_gsup_peer_id. https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_req.h File include/osmocom/gsupclient/gsup_req.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_req.h at 29 PS3, Line 29: (req) ? osmo_gsup_peer_id_to_str(&(req)->source_name) : "NULL", \ it shouldn't be called source_name anymore, but source_id. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:24:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:29:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:29:11 +0000 Subject: Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16206 ) Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() ...................................................................... Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:29:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:33:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:33:43 +0000 Subject: Change in osmo-hlr[master]: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16207 ) Change subject: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy ...................................................................... Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 Gerrit-Change-Number: 16207 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:33:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:35:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:35:17 +0000 Subject: Change in osmo-hlr[master]: enlarge the GSUP message headroom In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16208 ) Change subject: enlarge the GSUP message headroom ...................................................................... Patch Set 23: Test mslookup_client_mdns_test fails: """ -server_recv client_recv client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +server_recv """ I guess this can probably be fixed by using fake time in test? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7d86f2dadcae29fe1550ea2c9773394ab31a837b Gerrit-Change-Number: 16208 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:35:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:41:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:41:07 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 24: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16209/24/include/osmocom/hlr/hlr.h File include/osmocom/hlr/hlr.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16209/24/include/osmocom/hlr/hlr.h at 77 PS24, Line 77: } mslookup; struct mslookup_server directly? Or is that extended later? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:41:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:49:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:49:08 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 14: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/include/osmocom/hlr/mslookup_server.h File include/osmocom/hlr/mslookup_server.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/include/osmocom/hlr/mslookup_server.h at 22 PS14, Line 22: #include So no change in the header file but 2 new includes are added? That looks wrong... https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/include/osmocom/hlr/mslookup_server_mdns.h File include/osmocom/hlr/mslookup_server_mdns.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/include/osmocom/hlr/mslookup_server_mdns.h at 22 PS14, Line 22: #include bool is not used here, you can drop it. https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/dgsm_vty.c File src/dgsm_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/dgsm_vty.c at 177 PS14, Line 177: "service NAME at IP <1-65535>", let's drop that "at" here, I don't see it bringing anything good rather than having to type more. https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/dgsm_vty.c at 236 PS14, Line 236: "no service NAME at IP <1-65535>", remove "at". -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 08 Jan 2020 13:49:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 13:53:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 13:53:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: skip tests that need PCU socket access In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 ) Change subject: BTS_Tests: skip tests that need PCU socket access ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 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: I735b85d2ff3f541ebf0a558735d6172d69e7c29f Gerrit-Change-Number: 13748 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:53:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:04:57 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 8 Jan 2020 14:04:57 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: origin/master only References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16768 ) Change subject: jobs/update-osmo-ci-on-slaves: origin/master only ...................................................................... jobs/update-osmo-ci-on-slaves: origin/master only Don't run, when different branches were pushed. Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/16768/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index d1bc893..2c7309e 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -22,6 +22,8 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' skip-tag: true + branches: + - 'origin/master' triggers: - pollscm: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 Gerrit-Change-Number: 16768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:44:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:44:54 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 15: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/src/mslookup_server_mdns.c File src/mslookup_server_mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/src/mslookup_server_mdns.c at 130 PS15, Line 130: should_run = g_hlr->mslookup.allow_startup This looks like a fix from code belonging to a previous patch? https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/tests/test_nodes.vty File tests/test_nodes.vty: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/tests/test_nodes.vty at 403 PS15, Line 403: mdns to 239.192.23.42 4266 This "to" should be removed from VTY too. See for instance above "mdns bind 239.192.23.42 4266". BTW, afaik mDNS uses multicast addresses right? How does that work for source address? Is it the same? one picked by the kernel? May it make sense to have "bind-ip" and "remote-ip" cmds in the client mdns node then? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 14:44:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:46:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:46:18 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16336 ) Change subject: gsup_server: send routing error back to the correct peer ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 14:46:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:47:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:47:10 +0000 Subject: Change in osmo-hlr[master]: hlr_vty_subscr: prettier output for last LU seen In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16214 ) Change subject: hlr_vty_subscr: prettier output for last LU seen ...................................................................... Patch Set 24: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 Gerrit-Change-Number: 16214 Gerrit-PatchSet: 24 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 14:47:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:54:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:54:36 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 28: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc File doc/manuals/chapters/dgsm.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc at 41 PS28, Line 41: whitespace? https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc at 116 PS28, Line 116: whitespace? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 14:54:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:55:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:55:50 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist ...................................................................... Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 14:55:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 14:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 14:59:42 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 18: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/15359/18/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/15359/18/src/hlr_vty_subscr.c at 43 PS18, Line 43: tm = gmtime(t); Better use gmtime_r() to avoid possible issues if more threads are used later on. It's cheap doing it now and we avoid future issues. https://gerrit.osmocom.org/c/osmo-hlr/+/15359/18/src/hlr_vty_subscr.c at 45 PS18, Line 45: return "UNKNOWN"; is this string static? Or appended to the stack? Better strcpy() it to buf since we already have it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 18 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jan 2020 14:59:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:02:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 15:02:15 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16262 ) Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds ...................................................................... Patch Set 14: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 62 PS14, Line 62: #define UNIT_AGO(UNITNAME, UNITVAL) \ I'm pretty sure max already did something similar (libosmocore counters?) We may have something we can reuse from libosmocore. https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 67 PS14, Line 67: UNIT_AGO("d", 60*60*24); Wrong indentation starting from here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 15:02:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:03:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 15:03:50 +0000 Subject: Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16763 ) Change subject: auc3g: officially wrap IND around IND_bitlen space ...................................................................... Patch Set 2: Code-Review+1 You seem to know what you are doing here :) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 15:03:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:08:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 15:08:30 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16764/2/src/gsupclient/gsup_peer_id.c File src/gsupclient/gsup_peer_id.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16764/2/src/gsupclient/gsup_peer_id.c at 135 PS2, Line 135: *gsup_peer_id = (struct osmo_gsup_peer_id){}; Seems not related to this patch, but a fix for an older patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 15:08:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:10:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 15:10:06 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: origin/master only In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16768 ) Change subject: jobs/update-osmo-ci-on-slaves: origin/master only ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 Gerrit-Change-Number: 16768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 15:10:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:11:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 15:11:54 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: origin/master only In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16768 ) Change subject: jobs/update-osmo-ci-on-slaves: origin/master only ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 Gerrit-Change-Number: 16768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 15:11:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 15:35:52 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 8 Jan 2020 15:35:52 +0000 Subject: Change in osmo-gsm-manuals[master]: OS#2722: Add information about RACH tuning parameters References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 ) Change subject: OS#2722: Add information about RACH tuning parameters ...................................................................... OS#2722: Add information about RACH tuning parameters Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 --- M common/chapters/bibliography.adoc M common/chapters/bts.adoc 2 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/69/16769/1 diff --git a/common/chapters/bibliography.adoc b/common/chapters/bibliography.adoc index 96a8555..623f648 100644 --- a/common/chapters/bibliography.adoc +++ b/common/chapters/bibliography.adoc @@ -69,6 +69,9 @@ - [[[3gpp-ts-44-006]]] 3GPP TS 44.006: Mobile Station - Base Station System (MS - BSS) interface; Data Link (DL) layer specification http://www.3gpp.org/DynaReport/44006.htm +- [[[3gpp-ts-44-018]]] 3GPP TS 44.018: Mobile radio interface layer 3 + specification; Radio Resource Control (RRC) protocol + http://www.3gpp.org/DynaReport/44018.htm - [[[3gpp-ts-44-064]]] 3GPP TS 44.064: Mobile Station - Serving GPRS Support Node (MS-SGSN); Logical Link Control (LLC) Layer Specification http://www.3gpp.org/DynaReport/44064.htm diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 2a8c83a..223cec1 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -408,6 +408,15 @@ letting in more and more subscribers. This is especially useful for isolated cells with a huge number of subscribers. +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + ==== Load Management Every SIM card is member of one of the ten regular ACCs (0-9). Access to the @@ -446,3 +455,51 @@ <1> Turn on access-control-class ramping <2> Enable more ACCs every 30 seconds <3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 16:04:45 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 8 Jan 2020 16:04:45 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 18: (4 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py File contrib/dgsm/esme_dgsm.py: https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 4 PS18, Line 4: Copyright 2019 sysmocom s.f.m.c GmbH > This file is based on code from Rhizomatica, released under AGPL (see comment below in the file). If it's possible legally, as the author of the file this was based on, i'd give explicit permission to apply any less restrictive license. https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 42 PS18, Line 42: logging.info('PDU is not a DeliverSM. Is OsmoMSC configured properly?') You may log a lot of Alert Notifications (1 for each LUR) at log level info. These do not necessarily reflect improper configuration, although it is advisable to not bombard this blocking script with them https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 48 PS18, Line 48: " example, dropping message.") OOoops. There is certainly something wrong in RCCN! There is some unfinished code in there that should not exec, and a python indentation error, but the intention was to only reject certain messages with IEI != SMPP_UDHIEIE_CONCATENATED, these were mostly provider tracking messages or other non-user initiated SMS Multipart SMS should be handled. Just pass the pdu through. there's no reason not to as the receiving ME will reassemble. I would delete lines 45-49 https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 87 PS18, Line 87: registered_delivery=False, OK, this is a P.O.C. for testing, but why not respect the delivery report request anyway? The receiving osmo-msc should generate the delivery report which should come back through the same routing as this message. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 18 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Wed, 08 Jan 2020 16:04:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 17:14:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 17:14:06 +0000 Subject: Change in osmo-gsm-manuals[master]: OS#2722: Add information about RACH tuning parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 ) Change subject: OS#2722: Add information about RACH tuning parameters ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769/1//COMMIT_MSG at 7 PS1, Line 7: OS#2722: Add information about RACH tuning parameters bts.adoc: Add information about RACH tuning parameters Related: OS#2722 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 17:14:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 19:20:21 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 19:20:21 +0000 Subject: Change in libosmo-sccp[master]: Revert "fix memleaks in mtp_user_prim_cb()" References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 to review the following change. Change subject: Revert "fix memleaks in mtp_user_prim_cb()" ...................................................................... Revert "fix memleaks in mtp_user_prim_cb()" This reverts commit ffb248dd787eb854e049d990afc40f0e604268f2. Reason for revert: ttcn-msc-tests fail, apparently there are lots more xua_msg_free() in scrc_rx_mtp_xfer_ind_xua() that need to be dropped Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189 --- M src/sccp_scoc.c M src/sccp_user.c 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/16770/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index e2768ea..7570764 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1413,6 +1413,7 @@ /* sent to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); + xua_msg_free(xua); } /* Generate a RELCO based in input arguments */ @@ -1450,6 +1451,7 @@ /* send to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); + xua_msg_free(xua); } /* Generate a RLSD based in input arguments */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 49cc212..929445f 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,7 +174,6 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); - xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189 Gerrit-Change-Number: 16770 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 19:20:23 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 19:20:23 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: neels has created a revert of this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: revert -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 19:23:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 19:23:31 +0000 Subject: Change in libosmo-sccp[master]: Revert "fix memleaks in mtp_user_prim_cb()" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 ) Change subject: Revert "fix memleaks in mtp_user_prim_cb()" ...................................................................... Patch Set 1: Code-Review+2 This patch made all TTCN3 MSC_Test crash: #4 0x00007fd41437101c in xua_msg_free (msg=) at xua_msg.c:58 No locals. #5 0x00007fd414379385 in mtp_user_prim_cb (oph=0x61e000008768, ctx=) at sccp_user.c:177 inst = omp = 0x61e000008768 xua = 0x60d000021cf0 rc = 0 #6 0x00007fd414370cbb in m3ua_rx_xfer (xua=0x60d000021e90, asp=0x61800000c8e0) at m3ua.c:586 rctx = dh = as = #7 m3ua_rx_msg (asp=asp at entry=0x61800000c8e0, msg=msg at entry=0x61e0000090e0) at m3ua.c:739 xua = 0x60d000021e90 err = 0x0 rc = 0 #8 0x00007fd41438068b in xua_cli_read_cb (conn=0x6180000020e0) at osmo_ss7.c:1701 ofd = 0x6180000020e0 asp = 0x61800000c8e0 msg = 0x61e0000090e0 sinfo = {sinfo_stream = 1, sinfo_ssn = 0, sinfo_flags = 0, sinfo_ppid = 50331648, sinfo_context = 0, sinfo_timetolive = 0, sinfo_tsn = 2636227977, sinfo_cumtsn = 0, sinfo_assoc_id = 61} flags = 128 rc = 56 __func__ = "xua_cli_read_cb" #9 0x00007fd414fcce43 in osmo_stream_cli_read (cli=0x6180000020e0) at stream.c:222 No locals. #10 osmo_stream_cli_fd_cb (ofd=, what=1) at stream.c:311 cli = 0x6180000020e0 error = 384178024 ret = len = 4 __func__ = "osmo_stream_cli_fd_cb" #11 0x00007fd4153fe0bf in osmo_fd_disp_fds (_eset=, _wset=, _rset=) at select.c:227 flags = 1 ufd = 0x6180000020e0 tmp = 0x61400000e0a0 work = 1 #12 _osmo_select_main (polling=0) at select.c:265 readset = {__fds_bits = {0 }} writeset = {__fds_bits = {0 }} exceptset = {__fds_bits = {0 }} rc = no_time = {tv_sec = 0, tv_usec = 0} #13 0x00007fd4153fe776 in osmo_select_main_ctx (polling=) at select.c:291 rc = #14 0x0000559919ee5abc in main (argc=3, argv=0x7ffe36768b28) at msc_main.c:729 rc = 0 sccp_a = sccp_iu = -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189 Gerrit-Change-Number: 16770 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 19:23:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 19:24:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 19:24:29 +0000 Subject: Change in libosmo-sccp[master]: Revert "fix memleaks in mtp_user_prim_cb()" In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 ) Change subject: Revert "fix memleaks in mtp_user_prim_cb()" ...................................................................... Revert "fix memleaks in mtp_user_prim_cb()" This reverts commit ffb248dd787eb854e049d990afc40f0e604268f2. Reason for revert: ttcn-msc-tests fail, apparently there are lots more xua_msg_free() in scrc_rx_mtp_xfer_ind_xua() that need to be dropped Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189 --- M src/sccp_scoc.c M src/sccp_user.c 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index e2768ea..7570764 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1413,6 +1413,7 @@ /* sent to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); + xua_msg_free(xua); } /* Generate a RELCO based in input arguments */ @@ -1450,6 +1451,7 @@ /* send to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); + xua_msg_free(xua); } /* Generate a RLSD based in input arguments */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 49cc212..929445f 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,7 +174,6 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); - xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189 Gerrit-Change-Number: 16770 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 19:28:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 19:28:00 +0000 Subject: Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() ...................................................................... Patch Set 3: This patch was worth a try; I thought I had tested it back then, but apparently it's not sufficient. Still seems there are hidden free bugs / memleaks sprinkled here, hopefully someone will take a look at some point https://osmocom.org/issues/4348 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 19:28:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 20:10:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 20:10:27 +0000 Subject: Change in libosmo-sccp[master]: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 ) Change subject: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() ...................................................................... sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() Old commit of mine successfully fixed a memory leak, but apparently after some more investigation it seems to have introduced a double free of xua object in other code paths. Nowadays, it seems scrc_rx_mtp_xfer_ind_xua() is called from 3 different places: mtp_user_prim_cb() sua_rx_cl() sua_rx_co() Before present patch, first caller is not freeing the xua message and my old commit made scrc_rx_mtp_xfer_ind_xua() free it (by passing ownsership of the object). But the other 2 callers do free the xua object afterwards (actually the grandparent caller sua_rx_msg() does it), which means it would double-free the xua object. Let's move ownership out of scrc_rx_mtp_xfer_ind_xua() and let the caller free the xua object (only changes need on the first caller). This way everybody is happy and we keep the free() closer to the alloc(). Change-Id: Ia550b781b97adbdc0a0ad58a1075e5467e056f1e Related: OS#4348 Fixes: 9c3baa89fb6b3fc1ef588930f361d013f98a1e39 --- M src/sccp_scrc.c M src/sccp_user.c 2 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/71/16771/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index db49299..e259d7c 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -438,14 +438,13 @@ } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the - * MTP-TRANSFER.ind to SUA. Takes ownership of \a xua and frees it once processed. */ + * MTP-TRANSFER.ind to SUA. */ int scrc_rx_mtp_xfer_ind_xua(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; - int rc; LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -455,7 +454,6 @@ /* Node 1 (Sheet 3) */ /* deliver to SCOC */ sccp_scoc_rx_from_scrc(inst, xua); - xua_msg_free(xua); return 0; } /* We only treat connectionless and CR below */ @@ -465,9 +463,7 @@ /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { /* Node 6 (Sheet 3) */ - rc = scrc_node_6(inst, xua, &called); - xua_msg_free(xua); - return rc; + return scrc_node_6(inst, xua, &called); } /* Message with hop-counter? */ hop_ctr_part = xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR); @@ -476,9 +472,7 @@ if (hop_counter <= 1) { /* Error: hop-counter violation */ /* node 4 */ - rc = scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); - xua_msg_free(xua); - return rc; + return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); } /* Decrement hop-counter */ hop_counter--; @@ -498,7 +492,5 @@ default: break; } - rc = scrc_translate_node_9(inst, xua, &called); - xua_msg_free(xua); - return rc; + return scrc_translate_node_9(inst, xua, &called); } diff --git a/src/sccp_user.c b/src/sccp_user.c index 929445f..49cc212 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,6 +174,7 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); + xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia550b781b97adbdc0a0ad58a1075e5467e056f1e Gerrit-Change-Number: 16771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 20:18:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 20:18:37 +0000 Subject: Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 1: the idea is to use a single common format, so that running struct_endianess.py on the code trees results in no modifications -- so that in the long run we can use struct_endianess.py in the jenkins.sh as an endianess linter, and don't need to write the big endian bitfields manually -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 20:18:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 20:22:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jan 2020 20:22:07 +0000 Subject: Change in libosmo-netif[master]: configure: check for sctp.h In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h ...................................................................... Patch Set 1: just as background info: this patch came about after I rebuilt on a cleanly installed system, and ./configure failed to notice that sctp was available. Instead, I got a build error, and it was very confusing until I figured out the reason. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 20:22:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 8 22:52:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jan 2020 22:52:37 +0000 Subject: Change in libosmo-netif[master]: configure: check for sctp.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h ...................................................................... Patch Set 1: Yes I understand what's going on here, I'm just saying that fixing the issue actually requires another kind of work too that we already did in libosmocore and libosmo-sccp. I can work on it if required, but it shouldn't be much work and its' explained in my previous comment. As Harald shared previously, we should avoid having code being enabled/disabled automatically based on available libraries. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 22:52:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 00:09:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 00:09:34 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: Hello pespin, keith, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 to look at the new patch set (#15). Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 606 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/15 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 00:09:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 00:09:34 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#16). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 22 files changed, 2,007 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/16 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 16 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 00:09:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 00:09:34 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 to look at the new patch set (#29). Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... adoc: add D-GSM chapter to osmohlr-usermanual Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 --- A doc/examples/osmo-hlr-dgsm.cfg A doc/manuals/chapters/dgsm.adoc M doc/manuals/osmohlr-usermanual.adoc 3 files changed, 509 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16211/29 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 29 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 03:56:20 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 03:56:20 +0000 Subject: Change in libosmo-netif[master]: configure: check for sctp.h In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h ...................................................................... Patch Set 1: would be nice for me if you could take this over... :) I'd likely still fudge something up -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 03:56:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 09:26:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 9 Jan 2020 09:26:08 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 15: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/15/src/dgsm_vty.c File src/dgsm_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/15/src/dgsm_vty.c at 125 PS15, Line 125: "no mdns", should be "no mdns bind", this got lost while refactoring "mdns" to "mdns bind". -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 09:26:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 09:58:07 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 9 Jan 2020 09:58:07 +0000 Subject: Change in osmo-gsm-manuals[master]: bts.adoc: Add information about RACH tuning parameters In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 to look at the new patch set (#2). Change subject: bts.adoc: Add information about RACH tuning parameters ...................................................................... bts.adoc: Add information about RACH tuning parameters Related: OS#2722 Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 --- M common/chapters/bibliography.adoc M common/chapters/bts.adoc 2 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/69/16769/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 09:58:19 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 9 Jan 2020 09:58:19 +0000 Subject: Change in osmo-gsm-manuals[master]: bts.adoc: Add information about RACH tuning parameters In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 ) Change subject: bts.adoc: Add information about RACH tuning parameters ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769/1//COMMIT_MSG at 7 PS1, Line 7: OS#2722: Add information about RACH tuning parameters > bts.adoc: Add information about RACH tuning parameters [?] I really don't know what happened there.. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 09:58:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 10:00:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 10:00:46 +0000 Subject: Change in libosmo-sccp[master]: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 ) Change subject: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia550b781b97adbdc0a0ad58a1075e5467e056f1e Gerrit-Change-Number: 16771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 10:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 10:00:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 10:00:50 +0000 Subject: Change in libosmo-sccp[master]: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 ) Change subject: sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() ...................................................................... sua.c: Avoid double free in sua_rx_msg()->...->mtp_user_prim_cb() Old commit of mine successfully fixed a memory leak, but apparently after some more investigation it seems to have introduced a double free of xua object in other code paths. Nowadays, it seems scrc_rx_mtp_xfer_ind_xua() is called from 3 different places: mtp_user_prim_cb() sua_rx_cl() sua_rx_co() Before present patch, first caller is not freeing the xua message and my old commit made scrc_rx_mtp_xfer_ind_xua() free it (by passing ownsership of the object). But the other 2 callers do free the xua object afterwards (actually the grandparent caller sua_rx_msg() does it), which means it would double-free the xua object. Let's move ownership out of scrc_rx_mtp_xfer_ind_xua() and let the caller free the xua object (only changes need on the first caller). This way everybody is happy and we keep the free() closer to the alloc(). Change-Id: Ia550b781b97adbdc0a0ad58a1075e5467e056f1e Related: OS#4348 Fixes: 9c3baa89fb6b3fc1ef588930f361d013f98a1e39 --- M src/sccp_scrc.c M src/sccp_user.c 2 files changed, 5 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index db49299..e259d7c 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -438,14 +438,13 @@ } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the - * MTP-TRANSFER.ind to SUA. Takes ownership of \a xua and frees it once processed. */ + * MTP-TRANSFER.ind to SUA. */ int scrc_rx_mtp_xfer_ind_xua(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; - int rc; LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -455,7 +454,6 @@ /* Node 1 (Sheet 3) */ /* deliver to SCOC */ sccp_scoc_rx_from_scrc(inst, xua); - xua_msg_free(xua); return 0; } /* We only treat connectionless and CR below */ @@ -465,9 +463,7 @@ /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { /* Node 6 (Sheet 3) */ - rc = scrc_node_6(inst, xua, &called); - xua_msg_free(xua); - return rc; + return scrc_node_6(inst, xua, &called); } /* Message with hop-counter? */ hop_ctr_part = xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR); @@ -476,9 +472,7 @@ if (hop_counter <= 1) { /* Error: hop-counter violation */ /* node 4 */ - rc = scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); - xua_msg_free(xua); - return rc; + return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); } /* Decrement hop-counter */ hop_counter--; @@ -498,7 +492,5 @@ default: break; } - rc = scrc_translate_node_9(inst, xua, &called); - xua_msg_free(xua); - return rc; + return scrc_translate_node_9(inst, xua, &called); } diff --git a/src/sccp_user.c b/src/sccp_user.c index 929445f..49cc212 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,6 +174,7 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); + xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia550b781b97adbdc0a0ad58a1075e5467e056f1e Gerrit-Change-Number: 16771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 10:01:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 10:01:42 +0000 Subject: Change in osmo-gsm-manuals[master]: bts.adoc: Add information about RACH tuning parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 ) Change subject: bts.adoc: Add information about RACH tuning parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 10:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 10:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 10:01:58 +0000 Subject: Change in osmo-gsm-manuals[master]: bts.adoc: Add information about RACH tuning parameters In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 ) Change subject: bts.adoc: Add information about RACH tuning parameters ...................................................................... bts.adoc: Add information about RACH tuning parameters Related: OS#2722 Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 --- M common/chapters/bibliography.adoc M common/chapters/bts.adoc 2 files changed, 60 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/bibliography.adoc b/common/chapters/bibliography.adoc index 96a8555..623f648 100644 --- a/common/chapters/bibliography.adoc +++ b/common/chapters/bibliography.adoc @@ -69,6 +69,9 @@ - [[[3gpp-ts-44-006]]] 3GPP TS 44.006: Mobile Station - Base Station System (MS - BSS) interface; Data Link (DL) layer specification http://www.3gpp.org/DynaReport/44006.htm +- [[[3gpp-ts-44-018]]] 3GPP TS 44.018: Mobile radio interface layer 3 + specification; Radio Resource Control (RRC) protocol + http://www.3gpp.org/DynaReport/44018.htm - [[[3gpp-ts-44-064]]] 3GPP TS 44.064: Mobile Station - Serving GPRS Support Node (MS-SGSN); Logical Link Control (LLC) Layer Specification http://www.3gpp.org/DynaReport/44064.htm diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 2a8c83a..223cec1 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -408,6 +408,15 @@ letting in more and more subscribers. This is especially useful for isolated cells with a huge number of subscribers. +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + ==== Load Management Every SIM card is member of one of the ten regular ACCs (0-9). Access to the @@ -446,3 +455,51 @@ <1> Turn on access-control-class ramping <2> Enable more ACCs every 30 seconds <3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9a6b84cb988be2143672b954e7c6827f691f4a01 Gerrit-Change-Number: 16769 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 11:02:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 11:02:45 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 29: My comments from previous version still apply. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 29 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 11:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 11:03:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 11:03:57 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 16: My comments on previous version where not yet addressed -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 16 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 11:03:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 11:30:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 11:30:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E3-02dd2_=E2=86=92_1=2E6=2E1?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16772 ) Change subject: Bump version: 1.6.0.3-02dd2 ? 1.6.1 ...................................................................... Bump version: 1.6.0.3-02dd2 ? 1.6.1 Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/72/16772/1 diff --git a/debian/changelog b/debian/changelog index 6f50642..7b5f708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-msc (1.6.1) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() + + [ Neels Hofmeyr ] + * vlr_gsup_rx: fix uninitialized rc + * vlr.c: fix condition to check MSISDN presence + + -- Pau Espin Pedrol Thu, 09 Jan 2020 12:29:08 +0100 + osmo-msc (1.6.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 Gerrit-Change-Number: 16772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 11:33:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 11:33:30 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E3-02dd2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16772 ) Change subject: Bump version: 1.6.0.3-02dd2 ? 1.6.1 ...................................................................... Patch Set 1: Fixes osmo-msc crash upon receive of wrong MI IE. Avoids crash and failng in lots of TTCN3 MSC_Tests tests. TODO after release: update osmo-msc bb recipe in meta-telehony. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 Gerrit-Change-Number: 16772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Jan 2020 11:33:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 12:05:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 12:05:11 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E3-02dd2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16772 ) Change subject: Bump version: 1.6.0.3-02dd2 ? 1.6.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 Gerrit-Change-Number: 16772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 12:05:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 12:22:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 12:22:24 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E3-02dd2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16772 ) Change subject: Bump version: 1.6.0.3-02dd2 ? 1.6.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 Gerrit-Change-Number: 16772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 12:22:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 12:24:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 12:24:00 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E3-02dd2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16772 ) Change subject: Bump version: 1.6.0.3-02dd2 ? 1.6.1 ...................................................................... Bump version: 1.6.0.3-02dd2 ? 1.6.1 Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 6f50642..7b5f708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-msc (1.6.1) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * libmsc/gsm_04_08.c: fix: verify MI before calling vlr_subscr_rx_id_resp() + + [ Neels Hofmeyr ] + * vlr_gsup_rx: fix uninitialized rc + * vlr.c: fix condition to check MSISDN presence + + -- Pau Espin Pedrol Thu, 09 Jan 2020 12:29:08 +0100 + osmo-msc (1.6.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ac4ca12139230863607980cd29250c12df319b7 Gerrit-Change-Number: 16772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 13:02:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 13:02:05 +0000 Subject: Change in libosmo-sccp[master]: configure.ac: Check for sctp_recvmsg instead of sctp_send References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 ) Change subject: configure.ac: Check for sctp_recvmsg instead of sctp_send ...................................................................... configure.ac: Check for sctp_recvmsg instead of sctp_send sctp_send is not used at all in libosmo-sccp. sctp_recvmsg is used though. Change-Id: Iac90c5f531a136fb3535404a6fdfd4c2d7a594aa --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/73/16773/1 diff --git a/configure.ac b/configure.ac index 11b5fe8..9cf517a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,14 +35,14 @@ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) old_LIBS=$LIBS -AC_SEARCH_LIBS([sctp_send], [sctp], [ +AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) AC_SUBST(HAVE_LIBSCTP, [1]) if test -n "$ac_lib"; then AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) fi ], [ - AC_MSG_ERROR([sctp_send not found in searched libs])]) + AC_MSG_ERROR([sctp_recvmsg not found in searched libs])]) LIBS=$old_LIBS AC_ARG_ENABLE(sanitize, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac90c5f531a136fb3535404a6fdfd4c2d7a594aa Gerrit-Change-Number: 16773 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 13:05:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 13:05:45 +0000 Subject: Change in pysim[master]: cards: Add support for sysmo-isim-sja2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16691 ) Change subject: cards: Add support for sysmo-isim-sja2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf Gerrit-Change-Number: 16691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 13:05:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 13:05:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 13:05:50 +0000 Subject: Change in pysim[master]: cards: Add support for sysmo-isim-sja2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16691 ) Change subject: cards: Add support for sysmo-isim-sja2 ...................................................................... cards: Add support for sysmo-isim-sja2 The sysmo-isim-sja2 cards are not yet supported by pysim. Lets add support for writing KI and OPC in ADF.USIM and ADF.ISIM as well as the remaining common simcard parameters. Related: SYS#4466 Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf --- M pySim/cards.py M pySim/commands.py A pysim-testdata/sysmoISIM-SJA2.data A pysim-testdata/sysmoISIM-SJA2.ok 4 files changed, 199 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 758ec0e..9174ad5 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -144,6 +144,30 @@ data, sw = self._scc.update_binary(EF['SPN'], rpad(content, 32)) return sw + # Read the (full) AID for either ISIM or USIM application + def read_aid(self, isim = False): + + # First (known) halves of the AID + aid_usim = "a0000000871002" + aid_isim = "a0000000871004" + + # Select which one to look for + if isim: + aid = aid_isim + else: + aid = aid_usim + + # Find out how many records the EF.DIR has, then go through + # all records and try to find the AID we are looking for + aid_record_count = self._scc.record_count(['2F00']) + for i in range(0, aid_record_count): + record = self._scc.read_record(['2F00'], i + 1) + if aid in record[0]: + aid_len = int(record[0][6:8], 16) + return record[0][8:8 + aid_len * 2] + + return None + class _MagicSimBase(Card): """ @@ -911,10 +935,120 @@ return +class SysmoISIMSJA2(Card): + """ + sysmocom sysmoISIM-SJA2 + """ + + name = 'sysmoISIM-SJA2' + + def __init__(self, ssc): + super(SysmoISIMSJA2, self).__init__(ssc) + self._scc.cla_byte = "00" + self._scc.sel_ctrl = "0004" #request an FCP + + @classmethod + def autodetect(kls, scc): + try: + # Try card model #1 + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9" + if scc.get_atr() == toBytes(atr): + return kls(scc) + + # Try card model #2 + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2" + if scc.get_atr() == toBytes(atr): + return kls(scc) + except: + return None + return None + + def program(self, p): + # authenticate as ADM using default key (written on the card..) + if not p['pin_adm']: + raise ValueError("Please provide a PIN-ADM as there is no default one") + self._scc.verify_chv(0x0A, h2b(p['pin_adm'])) + + # This type of card does not allow to reprogram the ICCID. + # Reprogramming the ICCID would mess up the card os software + # license management, so the ICCID must be kept at its factory + # setting! + if p.get('iccid'): + print("Warning: Programming of the ICCID is not implemented for this type of card.") + + # select DF_GSM + self._scc.select_file(['7f20']) + + # write EF.IMSI + if p.get('imsi'): + self._scc.update_binary('6f07', enc_imsi(p['imsi'])) + + # EF.PLMNsel + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmnsel(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNsel failed with code %s"%sw) + + # EF.PLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNwAcT failed with code %s"%sw) + + # EF.OPLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_oplmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming OPLMNwAcT failed with code %s"%sw) + + # EF.AD + if p.get('mcc') and p.get('mnc'): + sw = self.update_ad(p['mnc']) + if sw != '9000': + print("Programming AD failed with code %s"%sw) + + # EF.SMSP + if p.get('smsp'): + r = self._scc.select_file(['3f00', '7f10']) + data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) + + # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is + # hard linked to EF-USIM_AUTH_KEY) + self._scc.select_file(['3f00']) + self._scc.select_file(['a515']) + if p.get('ki'): + self._scc.update_binary('6f20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('6f20', p['opc'], 17) + + # update EF-USIM_AUTH_KEY in ADF.ISIM + self._scc.select_file(['3f00']) + aid = self.read_aid(isim = True) + self._scc.select_adf(aid) + if p.get('ki'): + self._scc.update_binary('af20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('af20', p['opc'], 17) + + # update EF-USIM_AUTH_KEY in ADF.USIM + self._scc.select_file(['3f00']) + aid = self.read_aid() + self._scc.select_adf(aid) + if p.get('ki'): + self._scc.update_binary('af20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('af20', p['opc'], 17) + + return + + def erase(self): + return + + # In order for autodetection ... _cards_classes = [ FakeMagicSim, SuperSim, MagicSim, GrcardSim, SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, - FairwavesSIM, OpenCellsSim, WavemobileSim ] + FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2 ] def card_autodetect(scc): for kls in _cards_classes: diff --git a/pySim/commands.py b/pySim/commands.py index f2bdf7a..385cacf 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -107,6 +107,10 @@ rv.append(data) return rv + def select_adf(self, aid): + aidlen = ("0" + format(len(aid)/2, 'x'))[-2:] + return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid) + def read_binary(self, ef, length=None, offset=0): if not hasattr(type(ef), '__iter__'): ef = [ef] diff --git a/pysim-testdata/sysmoISIM-SJA2.data b/pysim-testdata/sysmoISIM-SJA2.data new file mode 100644 index 0000000..4b45a06 --- /dev/null +++ b/pysim-testdata/sysmoISIM-SJA2.data @@ -0,0 +1,7 @@ +MCC=001 +MNC=01 +ICCID=1122334455667788990 +KI=AABBCCDDEEFFAABBCCDDEEFFAABBCCDD +OPC=12345678901234567890123456789012 +IMSI=001010000000102 +ADM=72273953 diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok new file mode 100644 index 0000000..fb191e0 --- /dev/null +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -0,0 +1,53 @@ +Using PC/SC reader (dev=0) interface +Reading ... +ICCID: 8988211900000000004 +IMSI: 001010000000102 +SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +PLMNwAcT: + fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + +OPLMNwAcT: + fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + +HPLMNAcT: + ffffff0000 # unused + ffffff0000 # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffff0000 # unused + +ACC: 0001 +MSISDN: Not available +AD: 00000002 +Done ! + -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf Gerrit-Change-Number: 16691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 13:20:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 13:20:01 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Introduce --{enable, disable}-libsctp configure flag In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2) to the change originally created by neels. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure.ac: Introduce --{enable,disable}-libsctp configure flag ...................................................................... configure.ac: Introduce --{enable,disable}-libsctp configure flag Similar to what we do in libosmocore already, we want to deterministically enable or disable support for the feature without having into account if the system has a libsctp. If libsctp is missing and support is enabled, then fail. Extra checks are also added: * Check netinet/sctp.h header * Check libosmocore was built with libsctp support (API osmo_sock_init2_multiaddr() we require). * In stream.c make sure it can be built without HAVE_LIBSCTP, and that set_addrs() fails for more than 1 address (since that feature is only supported through osmo_sock_init2_multiaddrs()). Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d --- M configure.ac M src/stream.c 2 files changed, 38 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/16760/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 13:23:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 13:23:16 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Drop unneeded check for dahdi References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16774 ) Change subject: configure.ac: Drop unneeded check for dahdi ...................................................................... configure.ac: Drop unneeded check for dahdi This check was added during libosmo-netif's initial commit, and there's nothing requiring DAHDI in here. It's most possible a copy-paste artifact when creating configure.ac. Change-Id: Ief25a12696d797eaf50b0373e8310add93b9dc9e --- M configure.ac 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/74/16774/1 diff --git a/configure.ac b/configure.ac index a96fb70..8452d17 100644 --- a/configure.ac +++ b/configure.ac @@ -106,8 +106,6 @@ LIBS=$old_LIBS ]) -AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) - found_pcap=yes AC_CHECK_HEADERS(pcap.h,,found_pcap=no) AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ief25a12696d797eaf50b0373e8310add93b9dc9e Gerrit-Change-Number: 16774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:10:30 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 9 Jan 2020 14:10:30 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#9). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 131 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:21:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 14:21:40 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 9: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 198 PS9, Line 198: rssi_num Again, it's always 0 here, and the positive branch will never be taken. In general this part of the code is a hack, and we have to use hard-coded -110 here. https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 401 PS9, Line 401: toa_num Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:21:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:23:52 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 14:23:52 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: (1 comment) @pespin, you keep saying that separating is easy, and I keep trying to explain how it isn't: this patch has tight interdependence between the new items. You are welcome to try to separate. I have spent hours and days separating patches already, which did make sense in many places. I understand the point very much. But it is still necessary to review the combined result, and it makes little sense to spend more time on creating intermediate versions of osmo-hlr that will never be used. I know the review is harder than it should be, but separating would probably take longer than reviewing as-is. does that make sense? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/gsupclient/ipa_name.h File include/osmocom/gsupclient/ipa_name.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/include/osmocom/gsupclient/ipa_name.h at 29 PS23, Line 29: struct osmo_ipa_name { > I'm not really liking this kind of adhoc structures to keep a string specially since they are presen [?] the IPA name is a problem child, it is not entirely clear whether it is a string or arbitrary bytes with a length. The discussion was that this should also support global titles (that could contain zero bytes), and I assumed that we need to make all code paths treat it as binary data. However, many code paths expect it to be nul terminated, especially the hlr.db stores as VARCHAR. And then in code review quite recently, the request was to add a union that allows adding a global title separately, which I did (in the next patch "2/2" after this one). In retrospect it might make sense to snap ipa_name back to a plain char[] that is always nul terminated? Drop the separate len indicator? I think we should resolve this question before merging, feels like it indeed doesn't make sense like this. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:23:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 14:48:32 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: 1- I didn't say it was easy, yet is something really desirable. 2- I agree with keeping ipa-name as a null-terminated string. Simply add checks in case it's not upon receiving, but afaik it's not null terminated only on really old code of ours (and maybe nanobts?) which anyway is not being used here, and which was fixed a while ago to be null-terminated. 3- It's not only about reviewing for merge. It's a problem about discussing each change. It's a problem when reading the git log. It's a problem when bisecting. It's a problem when understanding why and how stuff was changed, and the implications it had. It's a problem when reverting. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:48:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:53:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 14:53:01 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: (4 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c File src/db.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c at 25 PS23, Line 25: #include > Non related at all, must go into a separate patch (if needed at all). dev cruft indeed https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsup_router.c File src/gsup_router.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsup_router.c at 99 PS23, Line 99: int gsup_route_add_ipa_name(struct osmo_gsup_conn *conn, const struct osmo_ipa_name *ipa_name) > and with this type of structs we end up doing like this function, simply adding extra layers. I find passing a val and separate length around very annoying, and it is also error prone. It adds extra lines of code and micro-code-dup all over the place. We should have kept a single struct from the start. I'd rather drop the gsup_route_add() version. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c File src/gsupclient/ipa_name.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c at 90 PS23, Line 90: return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); > So you are forcing the app using the library to enable the otc_select in this case? SHouldn't the fu [?] If I add a _c i'd also have to pass OTC_SELECT everywhere, which would probably be the proper way. That would also imply not being able to return a "" because the returned value always needs to be allocated. I kind of dislike writing OTC_SELECT in every LOGP(), so I thought I might get away with this more convenient combination; all current GSUP client programs use osmo_select_main_ctx()... Is that acceptable? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c at 777 PS23, Line 777: osmo_select_main_ctx(0); > Is this line change only needed to print stuff more easily? I think so, yes. It's a valid reason, too :) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:53:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 14:53:36 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16256/11/src/mslookup/mdns_sock.c File src/mslookup/mdns_sock.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16256/11/src/mslookup/mdns_sock.c at 129 PS11, Line 129: int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) > I think it might be an idea to optionally put this on the wire more than once, based on a configurat [?] as discussed on IRC: On lossy links, it makes sense to re-send N mDNS requests with a delay between them, configurable by cfg file. All that is required is a timer here that re-sends the same msgb N times. All the rest will already work without code changes: Each request reached will cause a separate response, and the requestor will consolidate all received results into one final result. (One could also consider caching responses at the server to optimize resending the same result, but that is likely overkill.) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Thu, 09 Jan 2020 14:53:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:54:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 9 Jan 2020 14:54:41 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 9: (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c at 735 PS7, Line 735: if (!gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) : process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); > we sould probably print an error message here (once? rate-limited)? Or even have an OSMO_ASSERT()? [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c at 760 PS1, Line 760: l1sap->u.tch. > I believe I explained this elsewhere here in gerrit or in redmine. [?] The is_sub flag is, as far as I know only set by the higher layers. From what I can see the higher layers are not setting it, at least not in l1sap.c. However when we the data ind and the measurement report are one indication the decision would be easy to make in l1sap.c https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c at a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ > the best would be if those values simply wouldn't count. [?] We could use rssi_sum rssi_num from the chan_state struct to do that. I see it in other places too so I use this method now. However, I am still not sure if this is right. The value is now averaged so when the signal fades it should be realistic, but what if there is a sudden signal drop then the lost SACCH frames we compensate here would reflect better signal conditions as they actually are. All in all it might not matter much as the measurement results are averaged anyway in the higher layers. https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c at 198 PS8, Line 198: *rssi_sum / *rssi_num > This is a TX burst handler, so there can be no RSSI measurements. [?] Yes, in TX the division by zero case is very likely. However, I see the division with rssi and toa in many other places. Do you think it makes sense to protect those as well? https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 401 PS9, Line 401: toa_num > Same here. Its probably the wrong approach to calculate those values from the chan_state. Instead I suggest to remember the last good toa256 and the last good rssi and use those instead. However I still do not understand why there aren't any toa256_sum values in the chan state. During the channel establishment phase, before the MS transmitting I see that there can not be any values but what happens when a TCH gets lost while the channel is up? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:54:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 14:59:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 14:59:30 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c File src/gsupclient/ipa_name.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c at 90 PS23, Line 90: return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); > If I add a _c i'd also have to pass OTC_SELECT everywhere, which would probably be the proper way. [?] 1- I might not understand it correctly, but isn't it find also allocating a "" string? It's a 1 byte buffer with '\0' on it right? 2- I'd really leave it up to the program to use OTC_SELECT or not, specially since it's only being used for logging purposes... As you know, I'm not really happy about this OTC_SELECT thing, and I specially dislike seeing it used for stuff which can be done in other ways easily too (for instance by passing a stack buffer as a param). -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:59:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:00:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:00:58 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Update to release 1.6.1 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16775 ) Change subject: osmo-msc: Update to release 1.6.1 ...................................................................... osmo-msc: Update to release 1.6.1 Change-Id: I2f559ba2b32bfd9ba6ca64fc153f5c73401fd5ee --- M recipes-osmocom/osmo-msc/osmo-msc_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/75/16775/1 diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 2f11b66..81bc071 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "6a0c4d9d24f7a591018898459b8767c6d1447309" +SRCREV = "4a5ba81f7d057373ed44ab66169faa1f9d7b46ea" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +PV = "1.6.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I2f559ba2b32bfd9ba6ca64fc153f5c73401fd5ee Gerrit-Change-Number: 16775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:01:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:01:31 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Update to release 1.6.1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16775 ) Change subject: osmo-msc: Update to release 1.6.1 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I2f559ba2b32bfd9ba6ca64fc153f5c73401fd5ee Gerrit-Change-Number: 16775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:01:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:01:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:01:35 +0000 Subject: Change in meta-telephony[201705]: osmo-msc: Update to release 1.6.1 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16775 ) Change subject: osmo-msc: Update to release 1.6.1 ...................................................................... osmo-msc: Update to release 1.6.1 Change-Id: I2f559ba2b32bfd9ba6ca64fc153f5c73401fd5ee --- M recipes-osmocom/osmo-msc/osmo-msc_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 2f11b66..81bc071 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "6a0c4d9d24f7a591018898459b8767c6d1447309" +SRCREV = "4a5ba81f7d057373ed44ab66169faa1f9d7b46ea" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.6.0+gitr${SRCPV}" +PV = "1.6.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I2f559ba2b32bfd9ba6ca64fc153f5c73401fd5ee Gerrit-Change-Number: 16775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:31:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 15:31:42 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 9: -Code-Review (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 198 PS9, Line 198: rssi_num > Again, it's always 0 here, and the positive branch will never be taken. [?] Or wait... I am sorry. I forgot that both Uplink and Downlink handlers share the same state. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:31:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:37:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 15:37:39 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 9: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 156 PS9, Line 156: uint8_t _sched_compose_ph_data_ind() accepts float AFAIR. https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 201 PS9, Line 201: 110 ... but shouldn't it be -110? https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 405 PS9, Line 405: 127 Also must be negative? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:37:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:45:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 15:45:19 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c at 401 PS9, Line 401: toa_num > Its probably the wrong approach to calculate those values from the chan_state. [?] In general we should not do loss detection of Rx/Uplink SACCH/TCH frames in Tx/Downlink burst handlers. Since we have NOPE indications, we can move this code to the proper place. This is not related to this change and should be done separately. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:45:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:48:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:48:14 +0000 Subject: Change in osmo-remsim[pespin/0.2.2]: add missing debian/libosmo-rspro1.install References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16776 to review the following change. Change subject: add missing debian/libosmo-rspro1.install ...................................................................... add missing debian/libosmo-rspro1.install In Change-Id I77c86455f9c36c16271bc8e7f8f3f72d682d23fd for some reason libosmo-rspro0.install was not renamed/moved but deleted, causing failures to build debian packages Change-Id: I825d70abbbd067955d7038377692beea87545ce0 --- A debian/libosmo-rspro1.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/76/16776/1 diff --git a/debian/libosmo-rspro1.install b/debian/libosmo-rspro1.install new file mode 100644 index 0000000..2b3a85d --- /dev/null +++ b/debian/libosmo-rspro1.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rspro*.so.* -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:48:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:48:14 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bpespin/0=2E2=2E2=5D=3A_Bump_version=3A_0=2E2=2E2=2E1-660b_=E2=86=92_0=2E2=2E3?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16777 ) Change subject: Bump version: 0.2.2.1-660b ? 0.2.3 ...................................................................... Bump version: 0.2.2.1-660b ? 0.2.3 Change-Id: Ib9f45d906a0f6895b8521194b4cf952b45af7338 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/77/16777/1 diff --git a/debian/changelog b/debian/changelog index 0ff1dea..bfa626f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-remsim (0.2.3) unstable; urgency=medium + + [ Harald Welte ] + * add missing debian/libosmo-rspro1.install + + -- Pau Espin Pedrol Thu, 09 Jan 2020 16:47:52 +0100 + osmo-remsim (0.2.2) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: Ib9f45d906a0f6895b8521194b4cf952b45af7338 Gerrit-Change-Number: 16777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 15:54:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 15:54:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 to look at the new patch set (#2). Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... pcu: Check received IMSI suffix from PCUIF paging request Change-Id: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/16696/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 16:05:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 16:05:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 16:05:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jan 9 14:36:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jan 2020 14:36:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e173a56c3fa7_12e32ae013cea5f44511e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 403s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] dh_install -O--fail-missing [ 403s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 403s] dh_install: This feature will be removed in compat 12. [ 404s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 404s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 404s] dh_missing: missing files, aborting [ 404s] The following debhelper tools have reported what they installed (with files per package) [ 404s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 404s] If the missing files are installed by another tool, please file a bug against it. [ 404s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 404s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 404s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 404s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 404s] For a short-term work-around: Add the files to debian/not-installed [ 404s] dh_install: dh_missing --fail-missing returned exit code 255 [ 404s] make: *** [debian/rules:12: binary] Error 255 [ 404s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 404s] [ 404s] lamb16 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 14:35:49 UTC 2020. [ 404s] [ 404s] ### VM INTERACTION START ### [ 407s] [ 388.704234] sysrq: SysRq : Power Off [ 407s] [ 388.721743] reboot: Power down [ 407s] ### VM INTERACTION END ### [ 407s] [ 407s] lamb16 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 14:35:52 UTC 2020. [ 407s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jan 9 14:36:18 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jan 2020 14:36:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e173a7643d6f_12e32ae013cea5f4451233@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 400s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 400s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 400s] dh_install -O--fail-missing [ 400s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 400s] dh_install: This feature will be removed in compat 12. [ 400s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 400s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 400s] dh_missing: missing files, aborting [ 400s] The following debhelper tools have reported what they installed (with files per package) [ 400s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 400s] If the missing files are installed by another tool, please file a bug against it. [ 400s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 400s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 400s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 400s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 400s] For a short-term work-around: Add the files to debian/not-installed [ 400s] dh_install: dh_missing --fail-missing returned exit code 255 [ 400s] make: *** [debian/rules:12: binary] Error 255 [ 400s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 400s] [ 400s] lamb61 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 14:36:03 UTC 2020. [ 400s] [ 400s] ### VM INTERACTION START ### [ 403s] [ 385.295672] sysrq: SysRq : Power Off [ 403s] [ 385.312697] reboot: Power down [ 403s] ### VM INTERACTION END ### [ 403s] [ 403s] lamb61 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 14:36:07 UTC 2020. [ 403s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jan 9 16:43:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 16:43:34 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_peer_id.h File include/osmocom/gsupclient/gsup_peer_id.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_peer_id.h at 30 PS3, Line 30: struct osmo_ipa_name { > So it is added in previous commit, then in this one it's moved to a new header while adding a new os [?] for hysterical raisins. I kept this separate because I was unsure whether we would keep this, in the end we could squash the two commits... https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_req.h File include/osmocom/gsupclient/gsup_req.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16459/3/include/osmocom/gsupclient/gsup_req.h at 29 PS3, Line 29: (req) ? osmo_gsup_peer_id_to_str(&(req)->source_name) : "NULL", \ > it shouldn't be called source_name anymore, but source_id. you're probably right. let's figure out what we have... "ipa-name" in the vty config, "vlr_number" in the hlr.sql, osmo_gsup_peer_id added here; total mixup. Would be nice if we had some sort of a plan for the future. a utopia to converge towards? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 16:43:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 16:45:03 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 16:45:03 +0000 Subject: Change in osmo-hlr[master]: enlarge the GSUP message headroom In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16208 ) Change subject: enlarge the GSUP message headroom ...................................................................... Patch Set 23: I wonder whether this test should be a regression test at all, using actual network? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7d86f2dadcae29fe1550ea2c9773394ab31a837b Gerrit-Change-Number: 16208 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 16:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:10:51 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:10:51 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 24: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16209/24/include/osmocom/hlr/hlr.h File include/osmocom/hlr/hlr.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16209/24/include/osmocom/hlr/hlr.h at 77 PS24, Line 77: } mslookup; > struct mslookup_server directly? Or is that extended later? yes, it is extended with client -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:10:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:12:05 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:12:05 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 15: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c File src/mslookup_server_mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c at 152 PS14, Line 152: OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr)); > SIGSEGV for me while configuring in the vty. [?] thx -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 17:12:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:15:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:15:02 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: would be nice if fixeria could verify that things have been addressed now -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:15:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:21:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 17:21:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 ) Change subject: bsc: Fix typo in comment ...................................................................... bsc: Fix typo in comment Change-Id: Iafaf4c500f05a2c98e8b151bbae0c15370b3bf22 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/16778/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 0141522..f1d2e63 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -534,7 +534,7 @@ /* Note: Do not use valueof() to get a value of this template, use * f_gen_test_hdlr_pars() instead in order to get a configuration that is - * matched to the current test situation (aoio vs. sccplite) */ + * matched to the current test situation (aoip vs. sccplite) */ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 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: Iafaf4c500f05a2c98e8b151bbae0c15370b3bf22 Gerrit-Change-Number: 16778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:52:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:52:29 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 15: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/15/src/dgsm_vty.c File src/dgsm_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/15/src/dgsm_vty.c at 125 PS15, Line 125: "no mdns", > should be "no mdns bind", this got lost while refactoring "mdns" to "mdns bind". Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 17:52:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:52:43 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:52:43 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 23: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c File src/db.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/db.c at 25 PS23, Line 25: #include > dev cruft indeed Done https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/hlr.c at 426 PS23, Line 426: osmo_gsup_message_type_name((gsup)->message_type), \ > Fixing () in the define could be a separate commit. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:52:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:53:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:53:01 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 16: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/src/mslookup_server_mdns.c File src/mslookup_server_mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/src/mslookup_server_mdns.c at 130 PS15, Line 130: should_run = g_hlr->mslookup.allow_startup > This looks like a fix from code belonging to a previous patch? Done https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/tests/test_nodes.vty File tests/test_nodes.vty: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/15/tests/test_nodes.vty at 403 PS15, Line 403: mdns to 239.192.23.42 4266 > This "to" should be removed from VTY too. See for instance above "mdns bind 239.192.23.42 4266". [?] we allow multiple binds on the same IP and port, and each client and server all bind to the same multicast IP and port. (every program also receives their own sent data and ignores.) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 16 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:53:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:55:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 17:55:27 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 29: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc File doc/manuals/chapters/dgsm.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc at 41 PS28, Line 41: > whitespace? Done https://gerrit.osmocom.org/c/osmo-hlr/+/16211/28/doc/manuals/chapters/dgsm.adoc at 116 PS28, Line 116: > whitespace? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 29 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:55:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 17:58:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 17:58:19 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: Code-Review+1 (3 comments) Feel free to merge, I do not want to block the whole patch set. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c File src/mslookup/mslookup.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 128 PS15, Line 128: strncmp(a->msisdn, b->msisdn, sizeof(a->msisdn)); > note that the n is sizeof(), i.e. the maximum buffer size, and not the strlen(). [?] Oh, I overlooked it. Fine by me. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup.c at 130 PS15, Line 130: return 0; > we don't know where the id came from, maybe it is random data incoming from the internet. [...] Ok, but shouldn't we sanitize/check the received data before passing to this function? If not an assert(), then at least a warning should be here. Or at least a different return value. Not a merge blocker though. https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c File src/mslookup/mslookup_client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/15/src/mslookup/mslookup_client.c at 59 PS15, Line 59: talloc_zero > I use talloc_zero() by principle, and in my coding style I often fully initialize all members shortl [?] Well, there is a bad side of zero-initialization: it's harder to see/find bugs. Neither ASAN nor Valgrind would show you that you're using a non-initialized value. That's e.g. why libosmovty could write to stdin/fd=0 (!), because somebody forgot to initialize it properly. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 17:58:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 18:01:58 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 19: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/15359/18/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/15359/18/src/hlr_vty_subscr.c at 45 PS18, Line 45: return "UNKNOWN"; > is this string static? Or appended to the stack? Better strcpy() it to buf since we already have it. alibi code path that is obsolete with gmtime_r() -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 19 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jan 2020 18:01:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:07:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:07:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 ) Change subject: bsc: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 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: Iafaf4c500f05a2c98e8b151bbae0c15370b3bf22 Gerrit-Change-Number: 16778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:07:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:07:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:07:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix typo in comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 ) Change subject: bsc: Fix typo in comment ...................................................................... bsc: Fix typo in comment Change-Id: Iafaf4c500f05a2c98e8b151bbae0c15370b3bf22 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 0141522..f1d2e63 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -534,7 +534,7 @@ /* Note: Do not use valueof() to get a value of this template, use * f_gen_test_hdlr_pars() instead in order to get a configuration that is - * matched to the current test situation (aoio vs. sccplite) */ + * matched to the current test situation (aoip vs. sccplite) */ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16778 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: Iafaf4c500f05a2c98e8b151bbae0c15370b3bf22 Gerrit-Change-Number: 16778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:07:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:07:23 +0000 Subject: Change in libosmo-sccp[master]: configure.ac: Check for sctp_recvmsg instead of sctp_send In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 ) Change subject: configure.ac: Check for sctp_recvmsg instead of sctp_send ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac90c5f531a136fb3535404a6fdfd4c2d7a594aa Gerrit-Change-Number: 16773 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:07:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:07:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:07:25 +0000 Subject: Change in libosmo-sccp[master]: configure.ac: Check for sctp_recvmsg instead of sctp_send In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 ) Change subject: configure.ac: Check for sctp_recvmsg instead of sctp_send ...................................................................... configure.ac: Check for sctp_recvmsg instead of sctp_send sctp_send is not used at all in libosmo-sccp. sctp_recvmsg is used though. Change-Id: Iac90c5f531a136fb3535404a6fdfd4c2d7a594aa --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 11b5fe8..9cf517a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,14 +35,14 @@ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) old_LIBS=$LIBS -AC_SEARCH_LIBS([sctp_send], [sctp], [ +AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) AC_SUBST(HAVE_LIBSCTP, [1]) if test -n "$ac_lib"; then AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) fi ], [ - AC_MSG_ERROR([sctp_send not found in searched libs])]) + AC_MSG_ERROR([sctp_recvmsg not found in searched libs])]) LIBS=$old_LIBS AC_ARG_ENABLE(sanitize, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac90c5f531a136fb3535404a6fdfd4c2d7a594aa Gerrit-Change-Number: 16773 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:07:40 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Drop unneeded check for dahdi In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16774 ) Change subject: configure.ac: Drop unneeded check for dahdi ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ief25a12696d797eaf50b0373e8310add93b9dc9e Gerrit-Change-Number: 16774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:08:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:08:52 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Introduce --{enable, disable}-libsctp configure flag In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure.ac: Introduce --{enable,disable}-libsctp configure flag ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 18:08:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:10:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/2/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/2/pcu/PCU_Tests_RAW.ttcn at 1414 PS2, Line 1414: log2str("W why this log2str here? I've nevere seen it before. just curious. IIRC, you should simply be able to do setverdict(fail, "Wrong IMSI ", foo, bar), no? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:10:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:10:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:10:40 +0000 Subject: Change in osmo-remsim[pespin/0.2.2]: add missing debian/libosmo-rspro1.install In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16776 ) Change subject: add missing debian/libosmo-rspro1.install ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:10:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:10:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 18:10:51 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bpespin/0=2E2=2E2=5D=3A_Bump_version=3A_0=2E2=2E2=2E1-660b_=E2=86=92_0=2E2=2E3?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16777 ) Change subject: Bump version: 0.2.2.1-660b ? 0.2.3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: Ib9f45d906a0f6895b8521194b4cf952b45af7338 Gerrit-Change-Number: 16777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 18:10:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:11:28 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jan 2020 18:11:28 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16262 ) Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds ...................................................................... Patch Set 15: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 62 PS14, Line 62: #define UNIT_AGO(UNITNAME, UNITVAL) \ > I'm pretty sure max already did something similar (libosmocore counters?) We may have something we c [?] can't find anything, let me know if you can https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 67 PS14, Line 67: UNIT_AGO("d", 60*60*24); > Wrong indentation starting from here. I don't see any wrong indentation? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 18:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:19:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 18:19:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/2/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/2/pcu/PCU_Tests_RAW.ttcn at 1414 PS2, Line 1414: log2str("W > why this log2str here? I've nevere seen it before. just curious. [?] Sorry I thought it was not possible but you are right, it's fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 18:19:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:20:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 18:20:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 to look at the new patch set (#3). Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... pcu: Check received IMSI suffix from PCUIF paging request Change-Id: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/16696/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:21:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 18:21:45 +0000 Subject: Change in osmo-remsim[pespin/0.2.2]: add missing debian/libosmo-rspro1.install In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16776 ) Change subject: add missing debian/libosmo-rspro1.install ...................................................................... add missing debian/libosmo-rspro1.install In Change-Id I77c86455f9c36c16271bc8e7f8f3f72d682d23fd for some reason libosmo-rspro0.install was not renamed/moved but deleted, causing failures to build debian packages Change-Id: I825d70abbbd067955d7038377692beea87545ce0 --- A debian/libosmo-rspro1.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/libosmo-rspro1.install b/debian/libosmo-rspro1.install new file mode 100644 index 0000000..2b3a85d --- /dev/null +++ b/debian/libosmo-rspro1.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rspro*.so.* -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:21:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 18:21:45 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bpespin/0=2E2=2E2=5D=3A_Bump_version=3A_0=2E2=2E2=2E1-660b_=E2=86=92_0=2E2=2E3?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16777 ) Change subject: Bump version: 0.2.2.1-660b ? 0.2.3 ...................................................................... Bump version: 0.2.2.1-660b ? 0.2.3 Change-Id: Ib9f45d906a0f6895b8521194b4cf952b45af7338 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 0ff1dea..bfa626f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-remsim (0.2.3) unstable; urgency=medium + + [ Harald Welte ] + * add missing debian/libosmo-rspro1.install + + -- Pau Espin Pedrol Thu, 09 Jan 2020 16:47:52 +0100 + osmo-remsim (0.2.2) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: pespin/0.2.2 Gerrit-Change-Id: Ib9f45d906a0f6895b8521194b4cf952b45af7338 Gerrit-Change-Number: 16777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 18:31:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 18:31:51 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16262 ) Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds ...................................................................... Patch Set 15: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 62 PS14, Line 62: #define UNIT_AGO(UNITNAME, UNITVAL) \ > can't find anything, let me know if you can core/timer.h: /* convert absolute time (in seconds) to elapsed days/hours/minutes */ #define OSMO_SEC2MIN(sec) ((sec % (60 * 60)) / 60) #define OSMO_SEC2HRS(sec) ((sec % (60 * 60 * 24)) / (60 * 60)) #define OSMO_SEC2DAY(sec) ((sec % (60 * 60 * 24 * 365)) / (60 * 60 * 24)) /* we ignore leap year for simplicity */ And I was thinking about rate_ctr_handler_fmt() but doesn't seem really reusable here, https://gerrit.osmocom.org/c/osmo-hlr/+/16262/14/src/hlr_vty_subscr.c at 67 PS14, Line 67: UNIT_AGO("d", 60*60*24); > I don't see any wrong indentation? My bad, I didn't see the else block starting before the define. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 18:31:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 19:38:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jan 2020 19:38:26 +0000 Subject: Change in libosmo-netif[master]: stream.c: Improve logging during sock send() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16779 ) Change subject: stream.c: Improve logging during sock send() ...................................................................... stream.c: Improve logging during sock send() Change-Id: Iff275c809ec2bb34f471d15bfdc92296566b76a7 --- M src/stream.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/79/16779/1 diff --git a/src/stream.c b/src/stream.c index 537fd28..fe3de2a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -239,8 +239,6 @@ struct llist_head *lh; int ret; - LOGSCLI(cli, LOGL_DEBUG, "sending data\n"); - if (llist_empty(&cli->tx_queue)) { cli->ofd.when &= ~BSC_FD_WRITE; return 0; @@ -254,6 +252,8 @@ return 0; } + LOGSCLI(cli, LOGL_DEBUG, "sending %u bytes of data\n", msgb_length(msg)); + switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: @@ -266,14 +266,14 @@ #endif case IPPROTO_TCP: default: - ret = send(cli->ofd.fd, msg->data, msg->len, 0); + ret = send(cli->ofd.fd, msg->data, msgb_length(msg), 0); break; } if (ret < 0) { if (errno == EPIPE || errno == ENOTCONN) { osmo_stream_cli_reconnect(cli); } - LOGSCLI(cli, LOGL_ERROR, "error to send\n"); + LOGSCLI(cli, LOGL_ERROR, "error %d to send\n", ret); } msgb_free(msg); return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff275c809ec2bb34f471d15bfdc92296566b76a7 Gerrit-Change-Number: 16779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 21:50:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 21:50:43 +0000 Subject: Change in docker-playground[master]: start debian-buster-build as copy of debian-jessie-build References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16780 ) Change subject: start debian-buster-build as copy of debian-jessie-build ...................................................................... start debian-buster-build as copy of debian-jessie-build Change-Id: I8eb6697ba736b933120bff5950b68294b4b4f842 --- A debian-buster-build/Dockerfile A debian-buster-build/Makefile 2 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/80/16780/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile new file mode 100644 index 0000000..6fe1efa --- /dev/null +++ b/debian-buster-build/Dockerfile @@ -0,0 +1,50 @@ +FROM debian:jessie + +MAINTAINER Harald Welte + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bison \ + build-essential \ + cppcheck \ + debhelper \ + devscripts \ + dh-autoreconf \ + dh-systemd \ + doxygen \ + flex \ + g++ \ + gawk \ + gcc \ + git \ + git-buildpackage \ + libc-ares-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libfftw3-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + libncurses5-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libtalloc-dev \ + libtool \ + libreadline-dev \ + libsctp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libusb-dev \ + libusb-1.0-0-dev \ + make \ + pkg-config \ + sqlite3 \ + wget && \ + apt-get clean diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-build/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8eb6697ba736b933120bff5950b68294b4b4f842 Gerrit-Change-Number: 16780 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 21:50:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 21:50:43 +0000 Subject: Change in docker-playground[master]: debian-buster-build: actually switch to buster References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16781 ) Change subject: debian-buster-build: actually switch to buster ...................................................................... debian-buster-build: actually switch to buster Change-Id: I35968431515e160b1ce6d766220a413a503f1a3a --- M debian-buster-build/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/16781/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 6fe1efa..3ea7891 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:buster MAINTAINER Harald Welte -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I35968431515e160b1ce6d766220a413a503f1a3a Gerrit-Change-Number: 16781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 21:50:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 21:50:43 +0000 Subject: Change in docker-playground[master]: debian-*-build: Add {gcc, newlib}-arm-none-eabi for simtrace2 firmware References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16782 ) Change subject: debian-*-build: Add {gcc,newlib}-arm-none-eabi for simtrace2 firmware ...................................................................... debian-*-build: Add {gcc,newlib}-arm-none-eabi for simtrace2 firmware The sitmrace2.git firmware buidl requires this cross-compiler. We so far didn't build it within this container, but lets make sure we could, if we'd want. Change-Id: If335247381aab2621fcbe6e6e596a1416e05fdf4 --- M debian-buster-build/Dockerfile M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/82/16782/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 3ea7891..4879616 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -21,6 +21,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ libc-ares-dev \ @@ -31,6 +32,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index 6fe1efa..c0cecb6 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -21,6 +21,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ libc-ares-dev \ @@ -31,6 +32,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index c1fe92b..02b80fd 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -22,6 +22,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ gnupg \ @@ -33,6 +34,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If335247381aab2621fcbe6e6e596a1416e05fdf4 Gerrit-Change-Number: 16782 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 21:55:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 21:55:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 ) Change subject: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() ...................................................................... MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() Makes both TC_iu_proc_ss_abort and TC_iu_proc_ss_paging_fail pass. Change-Id: If7d58cb50d2810975bd547e4e828783b0255d809 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16783/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 508acdd..1141c82 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3610,7 +3610,7 @@ /* Perform location update */ f_perform_lu(); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( @@ -3670,7 +3670,7 @@ /* Perform location update */ f_perform_lu(); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); /* PROC_SS_REQ initiates a mobile-originated SS/USSD session */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 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: If7d58cb50d2810975bd547e4e828783b0255d809 Gerrit-Change-Number: 16783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 21:58:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 21:58:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 to look at the new patch set (#2). Change subject: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() ...................................................................... MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() Makes both TC_iu_proc_ss_abort and TC_iu_proc_ss_paging_fail pass. Change-Id: If7d58cb50d2810975bd547e4e828783b0255d809 --- M msc/MSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16783/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 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: If7d58cb50d2810975bd547e4e828783b0255d809 Gerrit-Change-Number: 16783 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:06:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:06:42 +0000 Subject: Change in docker-playground[master]: docker-*-build: Add missign dependency to stow References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16784 ) Change subject: docker-*-build: Add missign dependency to stow ...................................................................... docker-*-build: Add missign dependency to stow Change-Id: Ia1adac1e8e56c6dfa283af9cf2e8f426c77ef2e1 --- M debian-buster-build/Dockerfile M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/16784/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 4879616..28116ab 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -48,5 +48,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index c0cecb6..9a2f9fc 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -48,5 +48,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index 02b80fd..35440a0 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -50,5 +50,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1adac1e8e56c6dfa283af9cf2e8f426c77ef2e1 Gerrit-Change-Number: 16784 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:06:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:06:43 +0000 Subject: Change in docker-playground[master]: Add debian-buster-simtrace2 Dockerfile References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16785 ) Change subject: Add debian-buster-simtrace2 Dockerfile ...................................................................... Add debian-buster-simtrace2 Dockerfile This container is useful for people wanting to have an easy method to gain a build environment for the simtrace2 firmware + host utilities. Change-Id: I08b2fc542dd3568d26f199427523cfa81eb26d70 --- A debian-buster-simtrace2/Dockerfile A debian-buster-simtrace2/Makefile A debian-buster-simtrace2/Release.key 3 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/85/16785/1 diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile new file mode 100644 index 0000000..cd1d359 --- /dev/null +++ b/debian-buster-simtrace2/Dockerfile @@ -0,0 +1,25 @@ +ARG USER +FROM $USER/debian-buster-build + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/" + +COPY Release.key /tmp/Release.key + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libosmocore-dev \ + && \ + apt-get clean + +RUN useradd -m osmocom +USER osmocom +WORKDIR /home/osmocom + +RUN git clone https://gerrit.osmocom.org/simtrace2 diff --git a/debian-buster-simtrace2/Makefile b/debian-buster-simtrace2/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-simtrace2/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/debian-buster-simtrace2/Release.key b/debian-buster-simtrace2/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-buster-simtrace2/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08b2fc542dd3568d26f199427523cfa81eb26d70 Gerrit-Change-Number: 16785 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:10:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:10:43 +0000 Subject: Change in docker-playground[master]: start debian-buster-build as copy of debian-jessie-build In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16780 ) Change subject: start debian-buster-build as copy of debian-jessie-build ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8eb6697ba736b933120bff5950b68294b4b4f842 Gerrit-Change-Number: 16780 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 22:10:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:10:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:10:48 +0000 Subject: Change in docker-playground[master]: debian-buster-build: actually switch to buster In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16781 ) Change subject: debian-buster-build: actually switch to buster ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I35968431515e160b1ce6d766220a413a503f1a3a Gerrit-Change-Number: 16781 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 22:10:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:10:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:10:53 +0000 Subject: Change in docker-playground[master]: debian-*-build: Add {gcc, newlib}-arm-none-eabi for simtrace2 firmware In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16782 ) Change subject: debian-*-build: Add {gcc,newlib}-arm-none-eabi for simtrace2 firmware ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If335247381aab2621fcbe6e6e596a1416e05fdf4 Gerrit-Change-Number: 16782 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 22:10:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:10:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:10:58 +0000 Subject: Change in docker-playground[master]: docker-*-build: Add missign dependency to stow In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16784 ) Change subject: docker-*-build: Add missign dependency to stow ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1adac1e8e56c6dfa283af9cf2e8f426c77ef2e1 Gerrit-Change-Number: 16784 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 22:10:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:11:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:11:06 +0000 Subject: Change in docker-playground[master]: start debian-buster-build as copy of debian-jessie-build In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16780 ) Change subject: start debian-buster-build as copy of debian-jessie-build ...................................................................... start debian-buster-build as copy of debian-jessie-build Change-Id: I8eb6697ba736b933120bff5950b68294b4b4f842 --- A debian-buster-build/Dockerfile A debian-buster-build/Makefile 2 files changed, 51 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile new file mode 100644 index 0000000..6fe1efa --- /dev/null +++ b/debian-buster-build/Dockerfile @@ -0,0 +1,50 @@ +FROM debian:jessie + +MAINTAINER Harald Welte + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get install -y --no-install-recommends \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bison \ + build-essential \ + cppcheck \ + debhelper \ + devscripts \ + dh-autoreconf \ + dh-systemd \ + doxygen \ + flex \ + g++ \ + gawk \ + gcc \ + git \ + git-buildpackage \ + libc-ares-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libfftw3-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + libncurses5-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libtalloc-dev \ + libtool \ + libreadline-dev \ + libsctp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libusb-dev \ + libusb-1.0-0-dev \ + make \ + pkg-config \ + sqlite3 \ + wget && \ + apt-get clean diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-build/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8eb6697ba736b933120bff5950b68294b4b4f842 Gerrit-Change-Number: 16780 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:11:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:11:07 +0000 Subject: Change in docker-playground[master]: debian-buster-build: actually switch to buster In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16781 ) Change subject: debian-buster-build: actually switch to buster ...................................................................... debian-buster-build: actually switch to buster Change-Id: I35968431515e160b1ce6d766220a413a503f1a3a --- M debian-buster-build/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 6fe1efa..3ea7891 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:buster MAINTAINER Harald Welte -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I35968431515e160b1ce6d766220a413a503f1a3a Gerrit-Change-Number: 16781 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:11:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:11:08 +0000 Subject: Change in docker-playground[master]: debian-*-build: Add {gcc, newlib}-arm-none-eabi for simtrace2 firmware In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16782 ) Change subject: debian-*-build: Add {gcc,newlib}-arm-none-eabi for simtrace2 firmware ...................................................................... debian-*-build: Add {gcc,newlib}-arm-none-eabi for simtrace2 firmware The sitmrace2.git firmware buidl requires this cross-compiler. We so far didn't build it within this container, but lets make sure we could, if we'd want. Change-Id: If335247381aab2621fcbe6e6e596a1416e05fdf4 --- M debian-buster-build/Dockerfile M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 3ea7891..4879616 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -21,6 +21,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ libc-ares-dev \ @@ -31,6 +32,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index 6fe1efa..c0cecb6 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -21,6 +21,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ libc-ares-dev \ @@ -31,6 +32,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index c1fe92b..02b80fd 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -22,6 +22,7 @@ g++ \ gawk \ gcc \ + gcc-arm-none-eabi \ git \ git-buildpackage \ gnupg \ @@ -33,6 +34,7 @@ libgps-dev \ libgsm1-dev \ libncurses5-dev \ + libnewlib-arm-none-eabi \ libortp-dev \ libpcap-dev \ libpcsclite-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If335247381aab2621fcbe6e6e596a1416e05fdf4 Gerrit-Change-Number: 16782 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:11:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:11:08 +0000 Subject: Change in docker-playground[master]: docker-*-build: Add missign dependency to stow In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16784 ) Change subject: docker-*-build: Add missign dependency to stow ...................................................................... docker-*-build: Add missign dependency to stow Change-Id: Ia1adac1e8e56c6dfa283af9cf2e8f426c77ef2e1 --- M debian-buster-build/Dockerfile M debian-jessie-build/Dockerfile M debian-stretch-build/Dockerfile 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 4879616..28116ab 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -48,5 +48,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index c0cecb6..9a2f9fc 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -48,5 +48,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index 02b80fd..35440a0 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -50,5 +50,6 @@ make \ pkg-config \ sqlite3 \ + stow \ wget && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia1adac1e8e56c6dfa283af9cf2e8f426c77ef2e1 Gerrit-Change-Number: 16784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:23:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:23:11 +0000 Subject: Change in docker-playground[master]: Add debian-buster-simtrace2 Dockerfile In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16785 ) Change subject: Add debian-buster-simtrace2 Dockerfile ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08b2fc542dd3568d26f199427523cfa81eb26d70 Gerrit-Change-Number: 16785 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jan 2020 22:23:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 22:23:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jan 2020 22:23:14 +0000 Subject: Change in docker-playground[master]: Add debian-buster-simtrace2 Dockerfile In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16785 ) Change subject: Add debian-buster-simtrace2 Dockerfile ...................................................................... Add debian-buster-simtrace2 Dockerfile This container is useful for people wanting to have an easy method to gain a build environment for the simtrace2 firmware + host utilities. Change-Id: I08b2fc542dd3568d26f199427523cfa81eb26d70 --- A debian-buster-simtrace2/Dockerfile A debian-buster-simtrace2/Makefile A debian-buster-simtrace2/Release.key 3 files changed, 46 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile new file mode 100644 index 0000000..cd1d359 --- /dev/null +++ b/debian-buster-simtrace2/Dockerfile @@ -0,0 +1,25 @@ +ARG USER +FROM $USER/debian-buster-build + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/" + +COPY Release.key /tmp/Release.key + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libosmocore-dev \ + && \ + apt-get clean + +RUN useradd -m osmocom +USER osmocom +WORKDIR /home/osmocom + +RUN git clone https://gerrit.osmocom.org/simtrace2 diff --git a/debian-buster-simtrace2/Makefile b/debian-buster-simtrace2/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-buster-simtrace2/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/debian-buster-simtrace2/Release.key b/debian-buster-simtrace2/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/debian-buster-simtrace2/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08b2fc542dd3568d26f199427523cfa81eb26d70 Gerrit-Change-Number: 16785 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jan 9 23:04:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jan 2020 23:04:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e17b18511b2c_12e32ae013cea5f46323e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 388s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 388s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 388s] dh_install -O--fail-missing [ 388s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 388s] dh_install: This feature will be removed in compat 12. [ 389s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 389s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 389s] dh_missing: missing files, aborting [ 389s] The following debhelper tools have reported what they installed (with files per package) [ 389s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 389s] If the missing files are installed by another tool, please file a bug against it. [ 389s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 389s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 389s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 389s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 389s] For a short-term work-around: Add the files to debian/not-installed [ 389s] dh_install: dh_missing --fail-missing returned exit code 255 [ 389s] make: *** [debian/rules:12: binary] Error 255 [ 389s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 389s] [ 389s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 23:04:17 UTC 2020. [ 389s] [ 389s] ### VM INTERACTION START ### [ 392s] [ 373.575458] sysrq: SysRq : Power Off [ 392s] [ 373.583031] reboot: Power down [ 392s] ### VM INTERACTION END ### [ 392s] [ 392s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Thu Jan 9 23:04:21 UTC 2020. [ 392s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jan 9 23:23:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 23:23:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: f_ran_register_imsi(): allow passing omit as TMSI References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 ) Change subject: MSC: f_ran_register_imsi(): allow passing omit as TMSI ...................................................................... MSC: f_ran_register_imsi(): allow passing omit as TMSI Change-Id: I6dd2f77283a79e83f028115f4cc42f05db885838 --- M library/RAN_Emulation.ttcnpp M msc/MSC_Tests.ttcn 2 files changed, 21 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/16786/1 diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 891de09..b54d6e4 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1444,8 +1444,17 @@ } /* helper function for clients to register their IMSI/TMSI */ -function f_ran_register_imsi(hexstring imsi, OCT4 tmsi) +function f_ran_register_imsi(hexstring imsi, template (omit) OCT4 tmsi_or_omit) runs on RAN_ConnHdlr { + var OCT4 tmsi; + + /* Resolve omit to a special reserved value */ + if (istemplatekind(tmsi_or_omit, "omit")) { + tmsi := 'FFFFFFFF'O; + } else { + tmsi := valueof(tmsi_or_omit); + } + BSSAP_PROC.call(RAN_register_imsi:{imsi, tmsi, self}) { [] BSSAP_PROC.getreply(RAN_register_imsi:{?,?,?}) {}; } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 529a396..f7df81a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1345,15 +1345,9 @@ private function f_mt_call_start(inout CallParameters cpars) runs on BSC_ConnHdlr { var MNCC_PDU mncc; var MgcpCommand mgcp_cmd; - var OCT4 tmsi; f_perform_lu(); - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Allocate call reference and send SETUP via MNCC to MSC */ cpars.mncc_callref := f_rnd_int(2147483648); @@ -1914,7 +1908,6 @@ /* LU followed by MT SMS */ friend function f_tc_lu_and_mt_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; f_init_handler(pars); @@ -1922,12 +1915,7 @@ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -1955,19 +1943,14 @@ /* Paging for MT SMS but no response */ friend function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; + f_init_handler(pars, 150.0); /* Perform location update */ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -2013,7 +1996,6 @@ /* LU followed by MT SMS with repeated paging */ friend function f_tc_lu_and_mt_sms_paging_repeated(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; f_init_handler(pars); @@ -2021,12 +2003,7 @@ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -2310,11 +2287,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( imsi := g_pars.imsi, @@ -2375,11 +2348,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( imsi := g_pars.imsi, @@ -2442,11 +2411,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Submit the 1st MT SMS on GSUP */ log("TX MT-forwardSM-Req for the 1st SMS"); @@ -2555,11 +2520,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Send CM Service Request for MO SMMA */ f_establish_fully(EST_TYPE_MO_SMS); @@ -2659,11 +2620,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( imsi := g_pars.imsi, @@ -2811,13 +2768,7 @@ SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)); /* register an 'expect' for given IMSI (+TMSI) */ - var OCT4 tmsi; - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var SmsParameters spars := valueof(t_SmsPars); /* TODO: test with more intelligent user data; test different coding schemes */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 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: I6dd2f77283a79e83f028115f4cc42f05db885838 Gerrit-Change-Number: 16786 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 23:52:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 23:52:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 to look at the new patch set (#3). Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... MSC: add test cases for concurrent MO/MT SS/USSD transactions Both test cases make use of the existing functions: - TC_multi_lu_and_mo_ussd: f_tc_lu_and_mo_ussd_single_request(), - TC_multi_lu_and_mt_ussd: f_tc_lu_and_mt_ussd_notification(), starting several (*) BSC_ConnHdlr components in parallel. (*) The maximum amount is limited by 16 - this is as much as both GSUP and SCTP emulation components can handle. Change-Id: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Related: OS#2931 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 87 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/16767/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 9 23:52:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jan 2020 23:52:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... library/GSUP_Emulation.ttcn: extend size of GsupExpectTable We already have 16 entries in the GsupImsiTable. Let's also extend the GsupExpectTable, so we can have 16 components of type BSC_ConnHdlr running in parallel. Change-Id: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba --- M library/GSUP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/16787/1 diff --git a/library/GSUP_Emulation.ttcn b/library/GSUP_Emulation.ttcn index ea8ba22..5695534 100644 --- a/library/GSUP_Emulation.ttcn +++ b/library/GSUP_Emulation.ttcn @@ -64,7 +64,7 @@ var ConnectionData GsupImsiTable[16]; /* pending expected incoming connections */ - var ExpectData GsupExpectTable[8]; + var ExpectData GsupExpectTable[16]; /* procedure based port to register for incoming connections */ port GSUPEM_PROC_PT GSUP_PROC; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 06:53:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Jan 2020 06:53:33 +0000 Subject: Change in osmo-hlr[master]: hlr: respect the num_auth_vectors requested References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16788 ) Change subject: hlr: respect the num_auth_vectors requested ...................................................................... hlr: respect the num_auth_vectors requested Previous the hlr always returned the maximum possible auth vectors (5) to the client. Even when only asked for a single auth vector. Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c --- M src/hlr.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/88/16788/1 diff --git a/src/hlr.c b/src/hlr.c index c3737d5..38b9022 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -234,6 +234,7 @@ struct osmo_gsup_message gsup_out; struct msgb *msg_out; bool separation_bit = false; + int num_auth_vectors = OSMO_GSUP_MAX_NUM_AUTH_INFO; int rc; subscr_create_on_demand(gsup->imsi); @@ -245,9 +246,13 @@ if (gsup->current_rat_type == OSMO_RAT_EUTRAN_SGS) separation_bit = true; + if (gsup->num_auth_vectors > 0 && + gsup->num_auth_vectors <= OSMO_GSUP_MAX_NUM_AUTH_INFO) + num_auth_vectors = gsup->num_auth_vectors; + rc = db_get_auc(dbc, gsup->imsi, conn->auc_3g_ind, gsup_out.auth_vectors, - ARRAY_SIZE(gsup_out.auth_vectors), + num_auth_vectors, gsup->rand, gsup->auts, separation_bit); if (rc <= 0) { gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c Gerrit-Change-Number: 16788 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 06:59:12 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Jan 2020 06:59:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 ) Change subject: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE OSMO_GSUP_NUM_VECTORS_REQ_IE allows the GSUP client to ask for a specific amount of auth tuples. Change-Id: I1be95c6a06610744b81ba043d236fce108598b79 --- M library/GSUP_Types.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/16789/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d4b1db1..880a6ad 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -61,6 +61,7 @@ OSMO_GSUP_IMEI_IE ('50'O), OSMO_GSUP_IMEI_RESULT_IE ('51'O), + OSMO_GSUP_NUM_VECTORS_REQ_IE ('52'O), OSMO_GSUP_MESSAGE_CLASS_IE ('0a'O), @@ -227,6 +228,7 @@ sm_alert_rsn, tag = OSMO_GSUP_SM_ALERT_RSN_IE; imei, tag = OSMO_GSUP_IMEI_IE; imei_result, tag = OSMO_GSUP_IMEI_RESULT_IE; + num_auth_vectors, tag = OSMO_GSUP_NUM_VECTORS_REQ_IE; message_class, tag = OSMO_GSUP_MESSAGE_CLASS_IE; source_name, tag = OSMO_GSUP_SOURCE_NAME_IE; destination_name, tag = OSMO_GSUP_DESTINATION_NAME_IE; @@ -290,6 +292,7 @@ GSUP_IMEI imei, GSUP_IMEIResult imei_result, + OCT1 num_auth_vectors, GSUP_Message_Class message_class, @@ -455,6 +458,12 @@ valueof(ts_GSUP_IE_CURRENT_RAT_TYPE(RAT_TYPE_EUTRAN_SGs)) }); +template (value) GSUP_PDU ts_GSUP_SAI_REQ_NUM_AUTH(hexstring imsi, OCT1 num_auth_vectors) := + ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_NUM_VECTORS_REQ(num_auth_vectors)) + }); + template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); @@ -859,6 +868,22 @@ } } +template (value) GSUP_IE ts_GSUP_IE_NUM_VECTORS_REQ(OCT1 num) := { + tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, + len := 0, /* overwritten */ + val := { + num_auth_vectors := num + } +} +template GSUP_IE tr_GSUP_IE_NUM_VECTORS_REQ(template OCT1 num) := { + tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, + len := ?, + val := { + num_auth_vectors := num + } +} + + /* Possible identity types for SM-RP-{OA|DA} IEs */ type enumerated GSUP_SM_RP_ODA_IdType { OSMO_GSUP_SM_RP_ODA_ID_NONE ('00'O), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 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: I1be95c6a06610744b81ba043d236fce108598b79 Gerrit-Change-Number: 16789 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 06:59:13 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Jan 2020 06:59:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... hlr: add TC_gsup_sai_num_auth_vectors TC_gsup_sai_num_auth_vectors tests the GSUP IE GSUP_IE_NUM_VECTORS_REQ which allows the client to ask for a specific amount of auth tuples in a Send Auth Info request. Change-Id: I10a523cbaf08fe42924ffd0dc498496fdc76395f --- M hlr/HLR_Tests.ttcn 1 file changed, 54 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/16790/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 50109a6..729fc03 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -50,6 +50,9 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_gsup_port := 4222; integer mp_hlr_ctrl_port := 4259; + /* how many auth tuples are expected + when IE ts_GSUP_IE_NUM_VECTORS_REQ is absent */ + integer mp_default_num_auth_tuples := 5; }; type record HlrSubscrAud2G { @@ -395,7 +398,7 @@ /* perform SendAuthInfo for given imsi, return the GSUP response/error */ function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit, - boolean is_eps := false) + boolean is_eps := false, template (omit) integer num_auth_tuple := omit) runs on HLR_ConnHdlr return GSUP_PDU { var GSUP_PDU ret; timer T := 3.0; @@ -406,6 +409,8 @@ if (is_eps) { GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); + } else if (not istemplatekind(num_auth_tuple, "omit")) { + GSUP.send(valueof(ts_GSUP_SAI_REQ_NUM_AUTH(imsi, int2oct(valueof(num_auth_tuple), 1)))); } else { GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); } @@ -710,11 +715,13 @@ /* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ private function f_TC_gsup_sai() runs on HLR_ConnHdlr { var GSUP_PDU res; + var integer num_auth_tuples; res := f_perform_SAI(g_pars.sub.imsi); if (ispresent(g_pars.sub.aud3g)) { f_ensure_amf_separation_bit(res, '0'B); } - /* TODO: match if tuple[s] matches expectation */ + + f_count_auth_tuples(res, mp_default_num_auth_tuples); setverdict(pass); } testcase TC_gsup_sai() runs on test_CT { @@ -729,6 +736,31 @@ setverdict(pass); } +/* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ +private function f_TC_gsup_sai_num_auth_vectors() runs on HLR_ConnHdlr { + var GSUP_PDU res; + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 1); + f_count_auth_tuples(res, 1); + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 4); + f_count_auth_tuples(res, 4); + // res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 5); + // f_count_auth_tuples(res, 5); + // res := f_perform_SAI(g_pars.sub.imsi, exp_err_cause :=, num_auth_tuple := 254); + // f_count_auth_tuples(res, 5); + setverdict(pass); +} +testcase TC_gsup_sai_num_auth_vectors() runs on test_CT { + var HlrSubscriberList sl; + var GSUP_PDU res; + + f_init(false); + + sl := f_gen_subs(); + f_start_handler_per_sub(refers(f_TC_gsup_sai_num_auth_vectors), sl); + + setverdict(pass); +} + private function f_ensure_amf_separation_bit(GSUP_PDU res, BIT1 sep_bit) { for (var integer i := 0; i < lengthof(res.ies); i := i+1) { @@ -749,6 +781,25 @@ } } +private function f_count_auth_tuples(GSUP_PDU res, template (omit) integer expected_auth_tuples := omit) +{ + var integer auth_tuples := 0; + for (var integer i := 0; i < lengthof(res.ies); i := i+1) { + var GSUP_IE tuple := res.ies[i]; + if (tuple.tag == OSMO_GSUP_AUTH_TUPLE_IE) { + auth_tuples := auth_tuples + 1; + } + } + + if ((not istemplatekind(expected_auth_tuples, "omit")) and + (auth_tuples != valueof(expected_auth_tuples))) { + setverdict(fail, + "Did not received expected number of auth tuples. Expected ", + mp_default_num_auth_tuples, + " but received ", auth_tuples); + } +} + /* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ private function f_TC_gsup_sai_eps() runs on HLR_ConnHdlr { var GSUP_PDU res; @@ -1471,6 +1522,7 @@ control { execute( TC_gsup_sai_err_invalid_imsi() ); execute( TC_gsup_sai() ); + execute( TC_gsup_sai_num_auth_vectors() ); execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:12:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 11:12:36 +0000 Subject: Change in osmo-hlr[master]: hlr: respect the num_auth_vectors requested In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16788 ) Change subject: hlr: respect the num_auth_vectors requested ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c Gerrit-Change-Number: 16788 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 10 Jan 2020 11:12:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:15:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 11:15:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 ) Change subject: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 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: I1be95c6a06610744b81ba043d236fce108598b79 Gerrit-Change-Number: 16789 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 10 Jan 2020 11:15:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:23:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 11:23:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 410 PS1, Line 410: is_eps Does it mean that NUM_VECTORS_REQ IE is supposed to be ignored when is_eps is true? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 718 PS1, Line 718: num_auth_tuples Unused variable? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 795 PS1, Line 795: (auth_tuples != valueof(expected_auth_tuples) You could just use match(expected_auth_tuples, auth_tuples) here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 10 Jan 2020 11:23:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:25:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:25:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 ) Change subject: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 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: If7d58cb50d2810975bd547e4e828783b0255d809 Gerrit-Change-Number: 16783 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:25:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:26:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:26:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: f_ran_register_imsi(): allow passing omit as TMSI In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 ) Change subject: MSC: f_ran_register_imsi(): allow passing omit as TMSI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 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: I6dd2f77283a79e83f028115f4cc42f05db885838 Gerrit-Change-Number: 16786 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:26:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:27:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:27:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn File library/GSUP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn at 67 PS1, Line 67: var ExpectData GsupExpectTable[16]; The question is: do we really need it? for what? please write so in the commit description -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:27:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:34:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:34:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:34:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:35:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:35:25 +0000 Subject: Change in osmo-hlr[master]: hlr: respect the num_auth_vectors requested In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16788 ) Change subject: hlr: respect the num_auth_vectors requested ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c Gerrit-Change-Number: 16788 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:35:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:51:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:51:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 ) Change subject: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 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: I1be95c6a06610744b81ba043d236fce108598b79 Gerrit-Change-Number: 16789 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:57:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 11:57:05 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Change prompt to not include any '-' symbols References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 ) Change subject: sccp_demo_user: Change prompt to not include any '-' symbols ...................................................................... sccp_demo_user: Change prompt to not include any '-' symbols It seems that our TTCN3 VTY/Telnet module no longer supports '-' inside prompts. Let's make sure the SCCP_Tests can again be executed by removing them from our promt name here. Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb --- M examples/sccp_demo_user.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/91/16791/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index b55b50c..3cbcc72 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -78,7 +78,7 @@ } static struct vty_app_info vty_info = { - .name = "sccp-demo-user", + .name = "SccpDemoUser", .version = 0, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb Gerrit-Change-Number: 16791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:57:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 11:57:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn File library/GSUP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn at 67 PS1, Line 67: var ExpectData GsupExpectTable[16]; > The question is: do we really need it? for what? please write so in the commit description ... "so we can have 16 components of type BSC_ConnHdlr running in parallel"? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:57:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 11:59:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 11:59:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn File library/GSUP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787/1/library/GSUP_Emulation.ttcn at 67 PS1, Line 67: var ExpectData GsupExpectTable[16]; > ... [?] sure, but have 16 components in parallel to do what? I only found out afterwards after looking at next commit... fine then I guess. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 11:59:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 12:01:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 12:01:47 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Change prompt to not include any '-' symbols In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 ) Change subject: sccp_demo_user: Change prompt to not include any '-' symbols ...................................................................... Patch Set 1: Fine to match other projects format, but actually TTCN3 supports is since 1a4d4e97b7cca28830304dce56c554aeb4de0258. The problem I think is that your branch laforge/sccp is not on top of master so that patch is not applied. Try re-running on top of master. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb Gerrit-Change-Number: 16791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 12:01:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 12:01:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 12:01:50 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Change prompt to not include any '-' symbols In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 ) Change subject: sccp_demo_user: Change prompt to not include any '-' symbols ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb Gerrit-Change-Number: 16791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 12:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 14:43:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 10 Jan 2020 14:43:40 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 22: (4 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py File contrib/dgsm/esme_dgsm.py: https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 4 PS18, Line 4: Copyright 2019 sysmocom s.f.m.c GmbH > If it's possible legally, as the author of the file this was based on, i'd give explicit permission [?] As discussed in IRC: changed to MIT. https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 42 PS18, Line 42: logging.info('PDU is not a DeliverSM. Is OsmoMSC configured properly?') > You may log a lot of Alert Notifications (1 for each LUR) at log level info. [?] Message changed to "PDU is not a DeliverSM, ignoring" https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 48 PS18, Line 48: " example, dropping message.") > OOoops. [?] Sorry to hear that there's a bug in RCCN :\ Thanks, I've deleted the lines. https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 87 PS18, Line 87: registered_delivery=False, > OK, this is a P.O.C. [?] Fixed. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Fri, 10 Jan 2020 14:43:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Comment-In-Reply-To: laforge Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 to look at the new patch set (#23). Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... contrib/dgsm/ add example esme and dialplan Add example scripts for the distributed GSM network: esme_dgsm.py: connect to the SMPP port of OsmoMSC A and forward SMS to the SMPP port of OsmoMSC B. The IP and port of OsmoMSC B is retrieved by the receiver's MSISDN using osmo-mslookup-client. contrib/dgsm/freeswitch_dialplan_dgsm.py: resolve the destination SIP servers of calls with osmo-mslookup-client and bridge the calls accordingly. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Related: OS#4254 Related: OS#4255 Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 --- M contrib/dgsm/Makefile.am A contrib/dgsm/esme_dgsm.py A contrib/dgsm/freeswitch_dialplan_dgsm.py 3 files changed, 237 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/04/16204/23 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 to look at the new patch set (#24). Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am M src/gsupclient/gsup_client.c A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 38 files changed, 1,620 insertions(+), 900 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 to look at the new patch set (#4). Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... 2/2: fixup: add osmo_gsup_peer_id with type enum and union During code review it was requested to insert an ability to handle different kinds of peer id, in order to be able to add a Global Title in the future. Add this, but only in the publicly visible API. For osmo-hlr internal code, I intend to push implementing this into the future, when a different peer identification actually gets introduced. This way we don't need to implement it now in all osmo-hlr code paths (save time now), but still make all API users aware that this type may be extended in the future. Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 --- M include/Makefile.am A include/osmocom/gsupclient/gsup_peer_id.h M include/osmocom/gsupclient/gsup_req.h D include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_server.h M src/Makefile.am M src/db_hlr.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/gsup_peer_id.c M src/gsupclient/gsup_req.c D src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/lu_fsm.c M tests/db/Makefile.am M tests/db/db_test.c M tests/gsup_server/Makefile.am 19 files changed, 332 insertions(+), 174 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/16459/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: Hello pespin, keith, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 to look at the new patch set (#16). Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 605 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/16 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 16 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#17). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 21 files changed, 2,005 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/17 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 17 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 to look at the new patch set (#30). Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... adoc: add D-GSM chapter to osmohlr-usermanual Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 --- A doc/examples/osmo-hlr-dgsm.cfg A doc/manuals/chapters/dgsm.adoc M doc/manuals/osmohlr-usermanual.adoc 3 files changed, 515 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16211/30 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 30 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:18 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#20) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... vty: show subscriber: change format of 'last LU seen' So far, the time string format comes from ctime_r, and we manually add "UTC" to it. The ctime_r format is wildly chaotic IMHO, mixing weekday, day-of-month and hour and year in very unsorted ways. Adding "UTC" to it is non-standard. Instead use an ISO-8601 standardized time string via strftime(). Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a --- M src/hlr_vty_subscr.c 1 file changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/15359/20 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 20 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:25 +0000 Subject: Change in osmo-hlr[master]: fix missing braces in LOGP_GSUP_FWD References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16792 ) Change subject: fix missing braces in LOGP_GSUP_FWD ...................................................................... fix missing braces in LOGP_GSUP_FWD Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e --- M src/hlr.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/16792/1 diff --git a/src/hlr.c b/src/hlr.c index c3737d5..6bed627 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -537,11 +537,11 @@ static char namebuf[255]; #define LOGP_GSUP_FWD(gsup, level, fmt, args ...) \ LOGP(DMAIN, level, "Forward %s (class=%s, IMSI=%s, %s->%s): " fmt, \ - osmo_gsup_message_type_name(gsup->message_type), \ - osmo_gsup_message_class_name(gsup->message_class), \ - gsup->imsi, \ - osmo_quote_str((const char *)gsup->source_name, gsup->source_name_len), \ - osmo_quote_str_buf2(namebuf, sizeof(namebuf), (const char *)gsup->destination_name, gsup->destination_name_len), \ + osmo_gsup_message_type_name((gsup)->message_type), \ + osmo_gsup_message_class_name((gsup)->message_class), \ + (gsup)->imsi, \ + osmo_quote_str((const char *)(gsup)->source_name, (gsup)->source_name_len), \ + osmo_quote_str_buf2(namebuf, sizeof(namebuf), (const char *)(gsup)->destination_name, (gsup)->destination_name_len), \ ## args) static int read_cb_forward(struct osmo_gsup_conn *conn, struct msgb *msg, const struct osmo_gsup_message *gsup) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e Gerrit-Change-Number: 16792 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:28:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jan 2020 15:28:26 +0000 Subject: Change in osmo-hlr[master]: esme_dgsm.py: add --always-fail option for debugging SMPP References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16793 ) Change subject: esme_dgsm.py: add --always-fail option for debugging SMPP ...................................................................... esme_dgsm.py: add --always-fail option for debugging SMPP Change-Id: Ibacf2676cae40712c89b57ced34085311d9a416d --- M contrib/dgsm/esme_dgsm.py 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/93/16793/1 diff --git a/contrib/dgsm/esme_dgsm.py b/contrib/dgsm/esme_dgsm.py index 75cf93d..9d7e040 100755 --- a/contrib/dgsm/esme_dgsm.py +++ b/contrib/dgsm/esme_dgsm.py @@ -100,6 +100,9 @@ time.sleep(args.sleep) logging.info("Sleep done") + if args.always_fail is not None: + return args.always_fail + result = query_mslookup("smpp.sms", msisdn) if 'v4' not in result or not result['v4']: logging.info('No IPv4 result from mslookup! This example only' @@ -147,12 +150,35 @@ parser.add_argument('--sleep', default=0, type=float, help='sleep time in seconds before forwarding an SMS,' ' to test multithreading (default: 0)') + parser.add_argument('--always-fail', default=None, metavar='SMPP_ESME_ERRCODE', + help='test delivery failure: always return an error code on Deliver-SM,' + ' pass an smpplib error code name like RDELIVERYFAILURE (see smpplib/consts.py),' + ' or an SMPP error code in hex digits') args = parser.parse_args() logging.basicConfig(level=logging.INFO, format='[%(asctime)s]' ' (%(threadName)s) %(message)s', datefmt="%H:%M:%S") + + if args.always_fail: + resolved = None + name = 'SMPP_ESME_' + args.always_fail + if hasattr(smpplib.consts, name): + resolved = getattr(smpplib.consts, name) + if resolved is None: + try: + resolved = int(args.always_fail, 16) + except ValueError: + resolved = None + if resolved is None: + print('Invalid argument for --always-fail: %r' % args.always_fail) + exit(1) + args.always_fail = resolved + logging.info('--always-fail: returning error code %s to all Deliver-SM' % hex(args.always_fail)) + smpp_bind() if __name__ == "__main__": main() + +# vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibacf2676cae40712c89b57ced34085311d9a416d Gerrit-Change-Number: 16793 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:40:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:40:42 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 20: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 20 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 10 Jan 2020 15:40:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:42:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:42:08 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Fri, 10 Jan 2020 15:42:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:43:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:43:40 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 30: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 30 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:43:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:46:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:46:24 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 17 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:46:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:46:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:46:53 +0000 Subject: Change in libosmo-sccp[master]: ss7: Return value from child function in osmo_ss7_xua_server_set_loca... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 ) Change subject: ss7: Return value from child function in osmo_ss7_xua_server_set_local_host ...................................................................... ss7: Return value from child function in osmo_ss7_xua_server_set_local_host It doesn't really change old behavior since it's impossible the child function returned an error with current implementation, but let's better return the return code in case new error paths are added. Change-Id: I24747578b3412b385c1ea1a14922f543f9023a27 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/94/16794/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 1ca8b5e..ee762c4 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1979,8 +1979,7 @@ int osmo_ss7_xua_server_set_local_host(struct osmo_xua_server *xs, const char *local_host) { - osmo_ss7_xua_server_set_local_hosts(xs, &local_host, 1); - return 0; + return osmo_ss7_xua_server_set_local_hosts(xs, &local_host, 1); } int -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I24747578b3412b385c1ea1a14922f543f9023a27 Gerrit-Change-Number: 16794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:46:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:46:55 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 ) Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... ss7: Introduce APIs to manage asp_peer hosts The coe managing addresses is decoupled from xua_server since they will also be used to manage addresses for ASPs. Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 51 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/95/16795/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index de9494b..1e5ca2c 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -429,6 +429,8 @@ }; int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer); +int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* local_hosts, size_t local_host_cnt); +int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *local_host); struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index ee762c4..b8396b8 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1113,6 +1113,49 @@ return len; } +int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* hosts, size_t host_cnt) +{ + int i = 0; + + if (host_cnt > ARRAY_SIZE(peer->host)) + return -EINVAL; + + for (; i < host_cnt; i++) + osmo_talloc_replace_string(talloc_ctx, &peer->host[i], hosts[i]); + for (; i < peer->host_cnt; i++) { + talloc_free(peer->host[i]); + peer->host[i] = NULL; + } + + peer->host_cnt = host_cnt; + return 0; +} + +int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) + +{ + int i; + bool new_is_any = !host || !strcmp(host, "0.0.0.0"); + bool iter_is_any; + + /* Makes no sense to have INET_ANY and specific addresses in the set */ + for (i = 0; i < peer->host_cnt; i++) { + iter_is_any = !peer->host[i] || + !strcmp(peer->host[i], "0.0.0.0"); + if (new_is_any && iter_is_any) + return -EINVAL; + if (!new_is_any && iter_is_any) + return -EINVAL; + } + /* Makes no sense to have INET_ANY many times */ + if (new_is_any && peer->host_cnt) + return -EINVAL; + + osmo_talloc_replace_string(talloc_ctx, &peer->host[peer->host_cnt], host); + peer->host_cnt++; + return 0; +} + struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name) { @@ -1985,51 +2028,22 @@ int osmo_ss7_xua_server_set_local_hosts(struct osmo_xua_server *xs, const char **local_hosts, size_t local_host_cnt) { - int i = 0; + int rc; OSMO_ASSERT(ss7_initialized); - if (local_host_cnt > ARRAY_SIZE(xs->cfg.local.host)) - return -EINVAL; - - for (; i < local_host_cnt; i++) - osmo_talloc_replace_string(xs, &xs->cfg.local.host[i], local_hosts[i]); - for (; i < xs->cfg.local.host_cnt; i++) { - talloc_free(xs->cfg.local.host[i]); - xs->cfg.local.host[i] = NULL; - } - - xs->cfg.local.host_cnt = local_host_cnt; - + rc = osmo_ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt); osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); - - return 0; + return rc; } int osmo_ss7_xua_server_add_local_host(struct osmo_xua_server *xs, const char *local_host) { - int i; - bool new_is_any = !local_host || !strcmp(local_host, "0.0.0.0"); - bool iter_is_any; + int rc; - /* Makes no sense to have INET_ANY and specific addresses in the set */ - for (i = 0; i < xs->cfg.local.host_cnt; i++) { - iter_is_any = !xs->cfg.local.host[i] || - !strcmp(xs->cfg.local.host[i], "0.0.0.0"); - if (new_is_any && iter_is_any) - return -EINVAL; - if (!new_is_any && iter_is_any) - return -EINVAL; - } - /* Makes no sense to have INET_ANY many times */ - if (new_is_any && xs->cfg.local.host_cnt) - return -EINVAL; - - osmo_talloc_replace_string(xs, &xs->cfg.local.host[xs->cfg.local.host_cnt], local_host); - xs->cfg.local.host_cnt++; - + rc = osmo_ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host); osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); - return 0; + return rc; } void osmo_ss7_xua_server_destroy(struct osmo_xua_server *xs) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:46:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:46:55 +0000 Subject: Change in libosmo-sccp[master]: ss7: Set ASP addresses using asp_peer APIs References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 ) Change subject: ss7: Set ASP addresses using asp_peer APIs ...................................................................... ss7: Set ASP addresses using asp_peer APIs Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a --- M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c 3 files changed, 14 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/16796/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index b8396b8..d09dba2 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1789,7 +1789,6 @@ struct osmo_xua_server *oxs = osmo_stream_srv_link_get_data(link); struct osmo_stream_srv *srv; struct osmo_ss7_asp *asp; - int i; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); @@ -1829,6 +1828,7 @@ oxs->cfg.proto); if (asp) { char hostbuf[INET6_ADDRSTRLEN]; + const char *hostbuf_ptr = &hostbuf[0]; char portbuf[16]; osmo_sock_get_ip_and_port(fd, hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), false); @@ -1837,14 +1837,14 @@ asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; asp->cfg.local.port = oxs->cfg.local.port; - for (i = 0; i < oxs->cfg.local.host_cnt; i++) - asp->cfg.local.host[i] = talloc_strdup(asp, oxs->cfg.local.host[i]); - asp->cfg.local.host_cnt = oxs->cfg.local.host_cnt; asp->cfg.remote.port = atoi(portbuf); - asp->cfg.remote.host[0] = talloc_strdup(asp, hostbuf); - asp->cfg.remote.host_cnt = 1; asp->dyn_allocated = true; asp->server = srv; + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + (const char* const*)oxs->cfg.local.host, + oxs->cfg.local.host_cnt); + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, + &hostbuf_ptr, 1); osmo_ss7_asp_restart(asp); } } diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 591254e..2931fb9 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -615,8 +615,7 @@ "Local IP Address from which to contact of ASP\n") { struct osmo_ss7_asp *asp = vty->index; - osmo_talloc_replace_string(asp, &asp->cfg.local.host[asp->cfg.local.host_cnt], argv[0]); - asp->cfg.local.host_cnt++; + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, argv[0]); return CMD_SUCCESS; } @@ -626,8 +625,7 @@ "Remote IP Address of ASP\n") { struct osmo_ss7_asp *asp = vty->index; - osmo_talloc_replace_string(asp, &asp->cfg.remote.host[asp->cfg.remote.host_cnt], argv[0]); - asp->cfg.remote.host_cnt++; + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, argv[0]); return CMD_SUCCESS; } @@ -1780,15 +1778,11 @@ case L_CS7_ASP_NODE: asp = vty->index; /* If no local addr was set */ - if (!asp->cfg.local.host_cnt) { - asp->cfg.local.host[0] = NULL; - asp->cfg.local.host_cnt = 1; - } + if (!asp->cfg.local.host_cnt) + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, NULL); /* If no remote addr was set */ - if (!asp->cfg.remote.host_cnt) { - asp->cfg.remote.host[0] = "127.0.0.1"; - asp->cfg.remote.host_cnt = 1; - } + if (!asp->cfg.remote.host_cnt) + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); osmo_ss7_asp_restart(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; diff --git a/src/sccp_user.c b/src/sccp_user.c index 49cc212..39ebc71 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -566,19 +566,8 @@ if (!asp) goto out_rt; asp_created = true; - - asp->cfg.local.host[0] = NULL; - asp->cfg.remote.host[0] = NULL; - if (default_local_ip) { - asp->cfg.local.host[0] = - talloc_strdup(asp, default_local_ip); - } - if (default_remote_ip) { - asp->cfg.remote.host[0] = - talloc_strdup(asp, default_remote_ip); - } - asp->cfg.local.host_cnt = 1; - asp->cfg.remote.host_cnt = 1; + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); asp->simple_client_allocated = true; } else talloc_free(asp_name); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a Gerrit-Change-Number: 16796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:46:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:46:56 +0000 Subject: Change in libosmo-sccp[master]: ss7: Fix sccp_simple_server rejecting connections References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 ) Change subject: ss7: Fix sccp_simple_server rejecting connections ...................................................................... ss7: Fix sccp_simple_server rejecting connections Server addresses (and remote added ones) were not being copied to the ASP and hence connections were not matches against the ASP when connecting: osmo_ss7.c:1820 (r=127.0.0.2:2905<->l=127.0.0.1:2905): m3ua connection without matching ASP definition and no dynamic registration enabled, terminating Related: OS#4355 Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e --- M src/sccp_user.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/97/16797/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index 39ebc71..9df5817 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -700,6 +700,7 @@ struct osmo_ss7_as *as; struct osmo_ss7_route *rt; struct osmo_ss7_asp *asp; + struct osmo_xua_server *oxs; char *as_name, *asp_name; if (local_port < 0) @@ -724,6 +725,15 @@ asp = osmo_ss7_asp_find_or_create(ss7, asp_name, remote_port, local_port, prot); if (!asp) goto out_rt; + oxs = osmo_ss7_xua_server_find(ss7, prot, local_port); + if (!oxs) + goto out_asp; + if (osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + (const char* const*)oxs->cfg.local.host, + oxs->cfg.local.host_cnt) < 0) + goto out_asp; + if (osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0) + goto out_asp; asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; osmo_ss7_as_add_asp(as, asp_name); @@ -733,6 +743,8 @@ return ss7->sccp; +out_asp: + osmo_ss7_asp_destroy(asp); out_rt: osmo_ss7_route_destroy(rt); out_as: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e Gerrit-Change-Number: 16797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:48:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:48:40 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... Patch Set 16: my comment regarding removal of "at" keyword from vty cmd was not applied. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 16 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 10 Jan 2020 15:48:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:49:52 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 4: Code-Review+1 I don't really like how -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:50:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:50:14 +0000 Subject: Change in osmo-hlr[master]: fix missing braces in LOGP_GSUP_FWD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16792 ) Change subject: fix missing braces in LOGP_GSUP_FWD ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e Gerrit-Change-Number: 16792 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:50:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:50:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:50:36 +0000 Subject: Change in osmo-hlr[master]: esme_dgsm.py: add --always-fail option for debugging SMPP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16793 ) Change subject: esme_dgsm.py: add --always-fail option for debugging SMPP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibacf2676cae40712c89b57ced34085311d9a416d Gerrit-Change-Number: 16793 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:50:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:51:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 15:51:39 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 4: [how] ... this patch together with previous one looks like, but if other's are fine with it I'm not going to block it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 15:51:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:57:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 15:57:25 +0000 Subject: Change in libosmo-sccp[master]: ss7: Return value from child function in osmo_ss7_xua_server_set_loca... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 ) Change subject: ss7: Return value from child function in osmo_ss7_xua_server_set_local_host ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I24747578b3412b385c1ea1a14922f543f9023a27 Gerrit-Change-Number: 16794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 Jan 2020 15:57:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:58:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 15:58:08 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 ) Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 Jan 2020 15:58:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:58:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 15:58:43 +0000 Subject: Change in libosmo-sccp[master]: ss7: Set ASP addresses using asp_peer APIs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 ) Change subject: ss7: Set ASP addresses using asp_peer APIs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a Gerrit-Change-Number: 16796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 Jan 2020 15:58:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:59:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 15:59:23 +0000 Subject: Change in libosmo-sccp[master]: ss7: Fix sccp_simple_server rejecting connections In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 ) Change subject: ss7: Fix sccp_simple_server rejecting connections ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e Gerrit-Change-Number: 16797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 10 Jan 2020 15:59:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 15:59:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 15:59:46 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Change prompt to not include any '-' symbols In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 ) Change subject: sccp_demo_user: Change prompt to not include any '-' symbols ...................................................................... sccp_demo_user: Change prompt to not include any '-' symbols It seems that our TTCN3 VTY/Telnet module no longer supports '-' inside prompts. Let's make sure the SCCP_Tests can again be executed by removing them from our promt name here. Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb --- M examples/sccp_demo_user.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index b55b50c..3cbcc72 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -78,7 +78,7 @@ } static struct vty_app_info vty_info = { - .name = "sccp-demo-user", + .name = "SccpDemoUser", .version = 0, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb Gerrit-Change-Number: 16791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:00:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:00:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 410 PS1, Line 410: is_eps > Does it mean that NUM_VECTORS_REQ IE is supposed to be ignored when is_eps is true? that would be wrong, IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 10 Jan 2020 16:00:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:01:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:01:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 ) Change subject: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 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: I1be95c6a06610744b81ba043d236fce108598b79 Gerrit-Change-Number: 16789 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:01:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:01:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:01:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 ) Change subject: library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... library/GSUP_Types: add support for OSMO_GSUP_NUM_VECTORS_REQ_IE OSMO_GSUP_NUM_VECTORS_REQ_IE allows the GSUP client to ask for a specific amount of auth tuples. Change-Id: I1be95c6a06610744b81ba043d236fce108598b79 --- M library/GSUP_Types.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d4b1db1..880a6ad 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -61,6 +61,7 @@ OSMO_GSUP_IMEI_IE ('50'O), OSMO_GSUP_IMEI_RESULT_IE ('51'O), + OSMO_GSUP_NUM_VECTORS_REQ_IE ('52'O), OSMO_GSUP_MESSAGE_CLASS_IE ('0a'O), @@ -227,6 +228,7 @@ sm_alert_rsn, tag = OSMO_GSUP_SM_ALERT_RSN_IE; imei, tag = OSMO_GSUP_IMEI_IE; imei_result, tag = OSMO_GSUP_IMEI_RESULT_IE; + num_auth_vectors, tag = OSMO_GSUP_NUM_VECTORS_REQ_IE; message_class, tag = OSMO_GSUP_MESSAGE_CLASS_IE; source_name, tag = OSMO_GSUP_SOURCE_NAME_IE; destination_name, tag = OSMO_GSUP_DESTINATION_NAME_IE; @@ -290,6 +292,7 @@ GSUP_IMEI imei, GSUP_IMEIResult imei_result, + OCT1 num_auth_vectors, GSUP_Message_Class message_class, @@ -455,6 +458,12 @@ valueof(ts_GSUP_IE_CURRENT_RAT_TYPE(RAT_TYPE_EUTRAN_SGs)) }); +template (value) GSUP_PDU ts_GSUP_SAI_REQ_NUM_AUTH(hexstring imsi, OCT1 num_auth_vectors) := + ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_NUM_VECTORS_REQ(num_auth_vectors)) + }); + template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); @@ -859,6 +868,22 @@ } } +template (value) GSUP_IE ts_GSUP_IE_NUM_VECTORS_REQ(OCT1 num) := { + tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, + len := 0, /* overwritten */ + val := { + num_auth_vectors := num + } +} +template GSUP_IE tr_GSUP_IE_NUM_VECTORS_REQ(template OCT1 num) := { + tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, + len := ?, + val := { + num_auth_vectors := num + } +} + + /* Possible identity types for SM-RP-{OA|DA} IEs */ type enumerated GSUP_SM_RP_ODA_IdType { OSMO_GSUP_SM_RP_ODA_ID_NONE ('00'O), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16789 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: I1be95c6a06610744b81ba043d236fce108598b79 Gerrit-Change-Number: 16789 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:01:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:01:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:01:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:02:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:02:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 ) Change subject: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 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: If7d58cb50d2810975bd547e4e828783b0255d809 Gerrit-Change-Number: 16783 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:02:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:02:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:02:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: f_ran_register_imsi(): allow passing omit as TMSI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 ) Change subject: MSC: f_ran_register_imsi(): allow passing omit as TMSI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 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: I6dd2f77283a79e83f028115f4cc42f05db885838 Gerrit-Change-Number: 16786 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:02:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:03:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:03:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:03:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:03:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:03:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 ) Change subject: MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() ...................................................................... MSC/Iu: fix SS/USSD tests: pass g_pars.tmsi to f_ran_register_imsi() Makes both TC_iu_proc_ss_abort and TC_iu_proc_ss_paging_fail pass. Change-Id: If7d58cb50d2810975bd547e4e828783b0255d809 --- M msc/MSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 508acdd..529a396 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3504,7 +3504,7 @@ runs on BSC_ConnHdlr { f_init_handler(pars); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); /* Perform location update */ @@ -3568,7 +3568,7 @@ /* Perform location update */ f_perform_lu(); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); /* Request referencing a non-existing SS session */ @@ -3610,7 +3610,7 @@ /* Perform location update */ f_perform_lu(); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ( @@ -3670,7 +3670,7 @@ /* Perform location update */ f_perform_lu(); - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_create_gsup_expect(hex2str(g_pars.imsi)); /* PROC_SS_REQ initiates a mobile-originated SS/USSD session */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16783 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: If7d58cb50d2810975bd547e4e828783b0255d809 Gerrit-Change-Number: 16783 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:03:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:03:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: f_ran_register_imsi(): allow passing omit as TMSI In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 ) Change subject: MSC: f_ran_register_imsi(): allow passing omit as TMSI ...................................................................... MSC: f_ran_register_imsi(): allow passing omit as TMSI Change-Id: I6dd2f77283a79e83f028115f4cc42f05db885838 --- M library/RAN_Emulation.ttcnpp M msc/MSC_Tests.ttcn 2 files changed, 21 insertions(+), 61 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 891de09..b54d6e4 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1444,8 +1444,17 @@ } /* helper function for clients to register their IMSI/TMSI */ -function f_ran_register_imsi(hexstring imsi, OCT4 tmsi) +function f_ran_register_imsi(hexstring imsi, template (omit) OCT4 tmsi_or_omit) runs on RAN_ConnHdlr { + var OCT4 tmsi; + + /* Resolve omit to a special reserved value */ + if (istemplatekind(tmsi_or_omit, "omit")) { + tmsi := 'FFFFFFFF'O; + } else { + tmsi := valueof(tmsi_or_omit); + } + BSSAP_PROC.call(RAN_register_imsi:{imsi, tmsi, self}) { [] BSSAP_PROC.getreply(RAN_register_imsi:{?,?,?}) {}; } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 529a396..f7df81a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1345,15 +1345,9 @@ private function f_mt_call_start(inout CallParameters cpars) runs on BSC_ConnHdlr { var MNCC_PDU mncc; var MgcpCommand mgcp_cmd; - var OCT4 tmsi; f_perform_lu(); - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Allocate call reference and send SETUP via MNCC to MSC */ cpars.mncc_callref := f_rnd_int(2147483648); @@ -1914,7 +1908,6 @@ /* LU followed by MT SMS */ friend function f_tc_lu_and_mt_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; f_init_handler(pars); @@ -1922,12 +1915,7 @@ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -1955,19 +1943,14 @@ /* Paging for MT SMS but no response */ friend function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; + f_init_handler(pars, 150.0); /* Perform location update */ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -2013,7 +1996,6 @@ /* LU followed by MT SMS with repeated paging */ friend function f_tc_lu_and_mt_sms_paging_repeated(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); - var OCT4 tmsi; f_init_handler(pars); @@ -2021,12 +2003,7 @@ f_perform_lu(); /* register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); @@ -2310,11 +2287,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( imsi := g_pars.imsi, @@ -2375,11 +2348,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( imsi := g_pars.imsi, @@ -2442,11 +2411,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Submit the 1st MT SMS on GSUP */ log("TX MT-forwardSM-Req for the 1st SMS"); @@ -2555,11 +2520,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); /* Send CM Service Request for MO SMMA */ f_establish_fully(EST_TYPE_MO_SMS); @@ -2659,11 +2620,7 @@ f_perform_lu(); /* Register an 'expect' for given IMSI (+TMSI) */ - if (isvalue(g_pars.tmsi)) { - f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - } else { - f_ran_register_imsi(g_pars.imsi, 'FFFFFFFF'O); - } + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( imsi := g_pars.imsi, @@ -2811,13 +2768,7 @@ SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)); /* register an 'expect' for given IMSI (+TMSI) */ - var OCT4 tmsi; - if (isvalue(g_pars.tmsi)) { - tmsi := g_pars.tmsi; - } else { - tmsi := 'FFFFFFFF'O; - } - f_ran_register_imsi(g_pars.imsi, tmsi); + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); var SmsParameters spars := valueof(t_SmsPars); /* TODO: test with more intelligent user data; test different coding schemes */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16786 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: I6dd2f77283a79e83f028115f4cc42f05db885838 Gerrit-Change-Number: 16786 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:03:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:03:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 ) Change subject: library/GSUP_Emulation.ttcn: extend size of GsupExpectTable ...................................................................... library/GSUP_Emulation.ttcn: extend size of GsupExpectTable We already have 16 entries in the GsupImsiTable. Let's also extend the GsupExpectTable, so we can have 16 components of type BSC_ConnHdlr running in parallel. Change-Id: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba --- M library/GSUP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GSUP_Emulation.ttcn b/library/GSUP_Emulation.ttcn index ea8ba22..5695534 100644 --- a/library/GSUP_Emulation.ttcn +++ b/library/GSUP_Emulation.ttcn @@ -64,7 +64,7 @@ var ConnectionData GsupImsiTable[16]; /* pending expected incoming connections */ - var ExpectData GsupExpectTable[8]; + var ExpectData GsupExpectTable[16]; /* procedure based port to register for incoming connections */ port GSUPEM_PROC_PT GSUP_PROC; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16787 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: Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba Gerrit-Change-Number: 16787 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:03:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:03:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions ...................................................................... MSC: add test cases for concurrent MO/MT SS/USSD transactions Both test cases make use of the existing functions: - TC_multi_lu_and_mo_ussd: f_tc_lu_and_mo_ussd_single_request(), - TC_multi_lu_and_mt_ussd: f_tc_lu_and_mt_ussd_notification(), starting several (*) BSC_ConnHdlr components in parallel. (*) The maximum amount is limited by 16 - this is as much as both GSUP and SCTP emulation components can handle. Change-Id: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Related: OS#2931 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 87 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f7df81a..177c2f8 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3695,6 +3695,44 @@ } +/* Verify multiple concurrent MO SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_multi_lu_and_mo_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[16]; + var integer i; + + f_init(); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i] := f_start_handler(refers(f_tc_lu_and_mo_ussd_single_request), 210 + i); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + +/* Verify multiple concurrent MT SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_multi_lu_and_mt_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[16]; + var integer i; + var OCT4 sid; + + f_init(); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + sid := '200001'O & int2oct(i, 1); /* All transactions must use different session ID */ + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), + f_init_pars(226 + i, gsup_sid := sid)); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + + /* A5/1 only permitted on network side; attempt an invalid CIPHER MODE COMPLETE with A5/3 which MSC should reject. */ private function f_tc_cipher_complete_with_invalid_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { pars.net.expect_auth := true; @@ -5845,6 +5883,9 @@ execute( TC_proc_ss_paging_fail() ); execute( TC_proc_ss_abort() ); + execute( TC_multi_lu_and_mo_ussd() ); + execute( TC_multi_lu_and_mt_ussd() ); + execute( TC_cipher_complete_with_invalid_cipher() ); execute( TC_cipher_complete_1_without_cipher() ); execute( TC_cipher_complete_3_without_cipher() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 586642b..b6b0983 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -462,6 +462,45 @@ vc_conn.done; } +/* Verify multiple concurrent MO SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_iu_multi_lu_and_mo_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlrPars pars; + var integer i; + + f_init(3); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + pars := f_init_pars(1100 + i, ran_idx := 2, ran_is_geran := false); + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mo_ussd_single_request), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + +/* Verify multiple concurrent MT SS/USSD transactions + * (one subscriber - one transaction) */ +testcase TC_iu_multi_lu_and_mt_ussd() runs on MTC_CT { + var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlrPars pars; + var integer i; + + f_init(3); + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + pars := f_init_pars(1110 + i, ran_idx := 2, ran_is_geran := false, + gsup_sid := '200001'O & int2oct(i, 1)); + vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), pars); + } + + for (i := 0; i < sizeof(vc_conn); i := i + 1) { + vc_conn[i].done; + } +} + testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -523,6 +562,9 @@ execute( TC_iu_proc_ss_paging_fail() ); execute( TC_iu_proc_ss_abort() ); + execute( TC_iu_multi_lu_and_mo_ussd() ); + execute( TC_iu_multi_lu_and_mt_ussd() ); + execute( TC_iu_lu_with_invalid_mcc_mnc() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ diff --git a/msc/expected-results.xml b/msc/expected-results.xml index a7b7142..074eeb1 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -73,6 +73,8 @@ + + @@ -212,6 +214,8 @@ + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 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: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:04:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:04:04 +0000 Subject: Change in osmo-hlr[master]: hlr: respect the num_auth_vectors requested In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16788 ) Change subject: hlr: respect the num_auth_vectors requested ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c Gerrit-Change-Number: 16788 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:04:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:04:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:04:08 +0000 Subject: Change in osmo-hlr[master]: hlr: respect the num_auth_vectors requested In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16788 ) Change subject: hlr: respect the num_auth_vectors requested ...................................................................... hlr: respect the num_auth_vectors requested Previous the hlr always returned the maximum possible auth vectors (5) to the client. Even when only asked for a single auth vector. Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c --- M src/hlr.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index c3737d5..38b9022 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -234,6 +234,7 @@ struct osmo_gsup_message gsup_out; struct msgb *msg_out; bool separation_bit = false; + int num_auth_vectors = OSMO_GSUP_MAX_NUM_AUTH_INFO; int rc; subscr_create_on_demand(gsup->imsi); @@ -245,9 +246,13 @@ if (gsup->current_rat_type == OSMO_RAT_EUTRAN_SGS) separation_bit = true; + if (gsup->num_auth_vectors > 0 && + gsup->num_auth_vectors <= OSMO_GSUP_MAX_NUM_AUTH_INFO) + num_auth_vectors = gsup->num_auth_vectors; + rc = db_get_auc(dbc, gsup->imsi, conn->auc_3g_ind, gsup_out.auth_vectors, - ARRAY_SIZE(gsup_out.auth_vectors), + num_auth_vectors, gsup->rand, gsup->auts, separation_bit); if (rc <= 0) { gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I20c2b648456bc7ba1fc1321a7d42852158a3523c Gerrit-Change-Number: 16788 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:05:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:05:31 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 20: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:06:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:06:26 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Fri, 10 Jan 2020 16:06:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:06:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:06:41 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... Patch Set 22: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:07:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:07:35 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 23: Code-Review+1 you may want to also update debian/copyright while at it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Fri, 10 Jan 2020 16:07:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:07:40 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... add libosmo-mslookup abstract client mslookup is a key concept in Distributed GSM, which allows querying the current location of a subscriber in a number of cooperating but independent core network sites, by arbitrary service names and by MSISDN/IMSI. Add the abstract mslookup client library. An actual lookup method (besides mslookup_client_fake.c) is added in a subsequent patch. For a detailed overview of this and upcoming patches, please see the elaborate comment at the top of mslookup.c. Add as separate library, libosmo-mslookup, to allow adding D-GSM capability to arbitrary client programs. osmo-hlr will be the only mslookup server implementation, added in a subsequent patch. osmo-hlr itself will also use this library and act as an mslookup client, when requesting the home HLR for locally unknown IMSIs. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 --- M .gitignore M configure.ac M debian/control A debian/libosmo-mslookup-dev.install A debian/libosmo-mslookup0.install M include/Makefile.am M include/osmocom/hlr/logging.h A include/osmocom/mslookup/mslookup.h A include/osmocom/mslookup/mslookup_client.h A include/osmocom/mslookup/mslookup_client_fake.h A libosmo-mslookup.pc.in M src/Makefile.am M src/logging.c A src/mslookup/Makefile.am A src/mslookup/mslookup.c A src/mslookup/mslookup_client.c A src/mslookup/mslookup_client_fake.c M tests/Makefile.am A tests/mslookup/Makefile.am A tests/mslookup/mslookup_client_test.c A tests/mslookup/mslookup_client_test.err A tests/mslookup/mslookup_test.c A tests/mslookup/mslookup_test.err M tests/testsuite.at 24 files changed, 1,622 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 8d4b450..acfea84 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,8 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump +tests/mslookup/mslookup_client_test +tests/mslookup/mslookup_test # manuals doc/manuals/*.html diff --git a/configure.ac b/configure.ac index 334a7e8..217df9f 100644 --- a/configure.ac +++ b/configure.ac @@ -174,10 +174,12 @@ doc/examples/Makefile src/Makefile src/gsupclient/Makefile + src/mslookup/Makefile include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile libosmo-gsup-client.pc + libosmo-mslookup.pc sql/Makefile doc/manuals/Makefile contrib/Makefile @@ -188,4 +190,5 @@ tests/gsup_server/Makefile tests/db/Makefile tests/db_upgrade/Makefile + tests/mslookup/Makefile ) diff --git a/debian/control b/debian/control index a32c68d..c1eb464 100644 --- a/debian/control +++ b/debian/control @@ -59,6 +59,28 @@ . This package contains the development headers. +Package: libosmo-mslookup0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Osmocom MS lookup library + This shared library contains routines for looking up mobile subscribers. + +Package: libosmo-mslookup-dev +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, + libosmo-mslookup0 (= ${binary:Version}), + libosmocore-dev +Pre-Depends: ${misc:Pre-Depends} +Description: Development headers of Osmocom MS lookup library + This shared library contains routines for looking up mobile subscribers. + . + This package contains the development headers. + Package: osmo-hlr-doc Architecture: all Section: doc diff --git a/debian/libosmo-mslookup-dev.install b/debian/libosmo-mslookup-dev.install new file mode 100644 index 0000000..539bba8 --- /dev/null +++ b/debian/libosmo-mslookup-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/mslookup +usr/lib/*/libosmo-mslookup*.a +usr/lib/*/libosmo-mslookup*.so +usr/lib/*/libosmo-mslookup*.la +usr/lib/*/pkgconfig/libosmo-mslookup.pc diff --git a/debian/libosmo-mslookup0.install b/debian/libosmo-mslookup0.install new file mode 100644 index 0000000..9cad0e8 --- /dev/null +++ b/debian/libosmo-mslookup0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-mslookup*.so.* diff --git a/include/Makefile.am b/include/Makefile.am index d8eb1ec..e9a7126 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,8 @@ SUBDIRS = osmocom -nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h +nobase_include_HEADERS = \ + osmocom/gsupclient/gsup_client.h \ + osmocom/mslookup/mslookup_client_fake.h \ + osmocom/mslookup/mslookup_client.h \ + osmocom/mslookup/mslookup.h \ + $(NULL) diff --git a/include/osmocom/hlr/logging.h b/include/osmocom/hlr/logging.h index ed24075..83f1acd 100644 --- a/include/osmocom/hlr/logging.h +++ b/include/osmocom/hlr/logging.h @@ -8,6 +8,7 @@ DGSUP, DAUC, DSS, + DMSLOOKUP, }; extern const struct log_info hlr_log_info; diff --git a/include/osmocom/mslookup/mslookup.h b/include/osmocom/mslookup/mslookup.h new file mode 100644 index 0000000..e90af33 --- /dev/null +++ b/include/osmocom/mslookup/mslookup.h @@ -0,0 +1,121 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/*! \defgroup mslookup Distributed GSM: finding subscribers + * @{ + * \file mslookup.h + */ + +#pragma once + +#include +#include +#include + +#define OSMO_MSLOOKUP_SERVICE_MAXLEN 64 + +bool osmo_mslookup_service_valid(const char *service); + +enum osmo_mslookup_id_type { + OSMO_MSLOOKUP_ID_NONE = 0, + OSMO_MSLOOKUP_ID_IMSI, + OSMO_MSLOOKUP_ID_MSISDN, +}; + +extern const struct value_string osmo_mslookup_id_type_names[]; +static inline const char *osmo_mslookup_id_type_name(enum osmo_mslookup_id_type val) +{ return get_value_string(osmo_mslookup_id_type_names, val); } + +struct osmo_mslookup_id { + enum osmo_mslookup_id_type type; + union { + char imsi[GSM23003_IMSI_MAX_DIGITS+1]; + char msisdn[GSM23003_MSISDN_MAX_DIGITS+1]; + }; +}; + +int osmo_mslookup_id_cmp(const struct osmo_mslookup_id *a, const struct osmo_mslookup_id *b); +bool osmo_mslookup_id_valid(const struct osmo_mslookup_id *id); + +enum osmo_mslookup_result_code { + OSMO_MSLOOKUP_RC_NONE = 0, + /*! An intermediate valid result. The request is still open for more results. */ + OSMO_MSLOOKUP_RC_RESULT, + /*! Returned when the final request timeout has elapsed without results. */ + OSMO_MSLOOKUP_RC_NOT_FOUND, +}; + +extern const struct value_string osmo_mslookup_result_code_names[]; +static inline const char *osmo_mslookup_result_code_name(enum osmo_mslookup_result_code val) +{ return get_value_string(osmo_mslookup_result_code_names, val); } + +/*! Information to request from a lookup. */ +struct osmo_mslookup_query { + /*! Which service to request, by freely invented names. For service name conventions (for voice, SMS, HLR,...), + * refer to the OsmoHLR user's manual http://ftp.osmocom.org/docs/latest/osmohlr-usermanual.pdf */ + char service[OSMO_MSLOOKUP_SERVICE_MAXLEN + 1]; + /*! IMSI or MSISDN to look up. */ + struct osmo_mslookup_id id; + + /*! Caller provided private data, if desired. */ + void *priv; +}; + +/*! Result data as passed back to a lookup client that invoked an osmo_mslookup_client_request. */ +struct osmo_mslookup_result { + /*! Outcome of the request. */ + enum osmo_mslookup_result_code rc; + + /*! IP address and port to reach the given service via IPv4, if any. */ + struct osmo_sockaddr_str host_v4; + + /*! IP address and port to reach the given service via IPv6, if any. */ + struct osmo_sockaddr_str host_v6; + + /*! How long ago the service last verified presence of the subscriber, in seconds, or zero if the presence is + * invariable (like the home HLR record for an IMSI). + * If a subscriber has recently moved to a different location, we get multiple replies and want to choose the + * most recent one. If this were a timestamp, firstly the time zones would need to be taken care of. + * Even if we choose UTC, a service provider with an inaccurate date/time would end up affecting the result. + * The least susceptible to configuration errors or difference in local and remote clock is a value that + * indicates the actual age of the record in seconds. The time that the lookup query took to be answered should + * be neglectable here, since we would typically wait one second (or very few seconds) for lookup replies, + * while typical Location Updating periods are in the range of 15 minutes. */ + uint32_t age; + + /*! Whether this is the last result returned for this request. */ + bool last; +}; + +int osmo_mslookup_query_init_from_domain_str(struct osmo_mslookup_query *q, const char *domain); + +size_t osmo_mslookup_id_name_buf(char *buf, size_t buflen, const struct osmo_mslookup_id *id); +char *osmo_mslookup_id_name_c(void *ctx, const struct osmo_mslookup_id *id); +char *osmo_mslookup_id_name_b(char *buf, size_t buflen, const struct osmo_mslookup_id *id); + +size_t osmo_mslookup_result_to_str_buf(char *buf, size_t buflen, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result); +char *osmo_mslookup_result_name_c(void *ctx, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result); +char *osmo_mslookup_result_name_b(char *buf, size_t buflen, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result); + +/*! @} */ diff --git a/include/osmocom/mslookup/mslookup_client.h b/include/osmocom/mslookup/mslookup_client.h new file mode 100644 index 0000000..cd0c21f --- /dev/null +++ b/include/osmocom/mslookup/mslookup_client.h @@ -0,0 +1,132 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include + +struct osmo_mslookup_client; +struct osmo_mslookup_result; + +typedef void (*osmo_mslookup_cb_t)(struct osmo_mslookup_client *client, + uint32_t request_handle, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result); + +/*! This handling information is passed along with a lookup request. + * It tells the osmo_mslookup_client layer how to handle responses received from various mslookup methods (at the time + * of writing only mDNS exists as a method, but the intention is to easily allow adding other methods in the future). + * This query handling info is not seen by the individual method implementations, to clarify that it is the + * osmo_mslookup_client layer that takes care of these details. */ +struct osmo_mslookup_query_handling { + /*! Wait at least this long before returning any results. + * + * If nonzero, result_cb will be called as soon as this delay has elapsed, either with the so far youngest age + * result, or with a "not found yet" result. After this delay has elapsed, receiving results will continue + * until result_timeout_milliseconds has elapsed. + * + * If zero, responses are fed to the result_cb right from the start, every time a younger aged result than + * before comes in. + * + * If a result with age == 0 is received, min_wait_milliseconds is ignored, the result is returned immediately + * and listening for responses ends. + * + * Rationale: If a subscriber has recently moved between sites, multiple results will arrive, and the youngest + * age wins. It can make sense to wait a minimum time for responses before determining the winning result. + * + * However, if no result or no valid result has arrived within a short period, the subscriber may be at a site + * that is far away or that is currently experiencing high latency. It is thus a good safety net to still + * receive results for an extended period of time. + * + * For some services, it is possible to establish links to every received result, and whichever link succeeds + * will be used (for example for SIP calls: first to pick up the call gets connected, the others are dropped + * silently). + */ + uint32_t min_wait_milliseconds; + + /*! Total time in milliseconds to listen for lookup responses. + * + * When this timeout elapses, osmo_mslookup_client_request_cancel() is called implicitly; Manually invoking + * osmo_mslookup_client_request_cancel() after result_timeout_milliseconds has elapsed is not necessary, but is + * still safe to do anyway. + * + * If zero, min_wait_milliseconds is also used as result_timeout_milliseconds; if that is also zero, a default + * timeout value is used. + * + * If result_timeout_milliseconds <= min_wait_milliseconds, then min_wait_milliseconds is used as + * result_timeout_milliseconds, i.e. the timeout triggers as soon as min_wait_milliseconds hits. + * + * osmo_mslookup_client_request_cancel() can be called any time to end the request. + */ + uint32_t result_timeout_milliseconds; + + /*! Invoked every time a result with a younger age than the previous result has arrived. + * To stop receiving results before result_timeout_milliseconds has elapsed, call + * osmo_mslookup_client_request_cancel(). + */ + osmo_mslookup_cb_t result_cb; +}; + +uint32_t osmo_mslookup_client_request(struct osmo_mslookup_client *client, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_query_handling *handling); + +void osmo_mslookup_client_request_cancel(struct osmo_mslookup_client *client, uint32_t request_handle); + +struct osmo_mslookup_client *osmo_mslookup_client_new(void *ctx); +bool osmo_mslookup_client_active(struct osmo_mslookup_client *client); +void osmo_mslookup_client_free(struct osmo_mslookup_client *client); + +/*! Describe a specific mslookup client method implementation. This struct is only useful for a lookup method + * implementation to add itself to an osmo_mslookup_client, see for example osmo_mslookup_client_add_mdns(). */ +struct osmo_mslookup_client_method { + struct llist_head entry; + + /*! Human readable name of this lookup method. */ + const char *name; + + /*! Private data for the lookup method implementation. */ + void *priv; + + /*! Backpointer to the client this method is added to. */ + struct osmo_mslookup_client *client; + + /*! Launch a lookup query. Called from osmo_mslookup_client_request(). + * The implementation returns results by calling osmo_mslookup_client_rx_result(). */ + void (*request)(struct osmo_mslookup_client_method *method, + const struct osmo_mslookup_query *query, + uint32_t request_handle); + /*! End a lookup query. Called from osmo_mslookup_client_request_cancel(). It is guaranteed to be called + * exactly once per above request() invocation. (The API user is required to invoke + * osmo_mslookup_client_request_cancel() exactly once per osmo_mslookup_client_request().) */ + void (*request_cleanup)(struct osmo_mslookup_client_method *method, + uint32_t request_handle); + + /*! The mslookup_client is removing this method, clean up all open requests, lists and allocations. */ + void (*destruct)(struct osmo_mslookup_client_method *method); +}; + +void osmo_mslookup_client_method_add(struct osmo_mslookup_client *client, + struct osmo_mslookup_client_method *method); +bool osmo_mslookup_client_method_del(struct osmo_mslookup_client *client, + struct osmo_mslookup_client_method *method); +void osmo_mslookup_client_rx_result(struct osmo_mslookup_client *client, uint32_t request_handle, + const struct osmo_mslookup_result *result); diff --git a/include/osmocom/mslookup/mslookup_client_fake.h b/include/osmocom/mslookup/mslookup_client_fake.h new file mode 100644 index 0000000..9fffc94 --- /dev/null +++ b/include/osmocom/mslookup/mslookup_client_fake.h @@ -0,0 +1,34 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +/*! MS lookup fake API for testing purposes. */ +#include + +struct osmo_mslookup_fake_response { + struct timeval time_to_reply; + struct osmo_mslookup_id for_id; + const char *for_service; + struct osmo_mslookup_result result; + bool sent; +}; + +struct osmo_mslookup_client_method *osmo_mslookup_client_add_fake(struct osmo_mslookup_client *client, + struct osmo_mslookup_fake_response *responses, + size_t responses_len); diff --git a/libosmo-mslookup.pc.in b/libosmo-mslookup.pc.in new file mode 100644 index 0000000..25a873c --- /dev/null +++ b/libosmo-mslookup.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom MS Lookup Library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} @TALLOC_LIBS@ -losmogsm -losmo-mslookup -losmocore +Cflags: -I${includedir}/ + diff --git a/src/Makefile.am b/src/Makefile.am index a5b71cf..f858ff0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = gsupclient +SUBDIRS = \ + gsupclient \ + mslookup \ + $(NULL) AM_CFLAGS = \ -Wall \ diff --git a/src/logging.c b/src/logging.c index 3713ab3..d0b79cf 100644 --- a/src/logging.c +++ b/src/logging.c @@ -25,7 +25,12 @@ .color = "\033[1;34m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - + [DMSLOOKUP] = { + .name = "DMSLOOKUP", + .description = "Mobile Subscriber Lookup", + .color = "\033[1;35m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info hlr_log_info = { diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am new file mode 100644 index 0000000..01be401 --- /dev/null +++ b/src/mslookup/Makefile.am @@ -0,0 +1,23 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=0:0:0 + +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +lib_LTLIBRARIES = libosmo-mslookup.la + +libosmo_mslookup_la_SOURCES = \ + mslookup.c \ + mslookup_client.c \ + mslookup_client_fake.c \ + $(NULL) + +libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) +libosmo_mslookup_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(TALLOC_LIBS) \ + $(NULL) diff --git a/src/mslookup/mslookup.c b/src/mslookup/mslookup.c new file mode 100644 index 0000000..d399e3a --- /dev/null +++ b/src/mslookup/mslookup.c @@ -0,0 +1,321 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include + +/*! \addtogroup mslookup + * + * Distributed GSM: finding subscribers + * + * There are various aspects of the D-GSM code base in osmo-hlr.git, here is an overview: + * + * mslookup is the main enabler of D-GSM, a concept for connecting services between independent core network stacks. + * + * D-GSM consists of: + * (1) mslookup client to find subscribers: + * (a) external clients like ESME, SIP PBX, ... ask osmo-hlr to tell where to send SMS, voice calls, ... + * (b) osmo-hlr's own mslookup client asks remote osmo-hlrs whether they know a given IMSI. + * (2) when a subscriber was found at a remote HLR, GSUP gets forwarded there: + * (a) to deliver messages for the GSUP proxy, osmo-hlr manages many GSUP clients to establish links to remote HLRs. + * (b) osmo-hlr has a GSUP proxy layer that caches data of IMSIs that get proxied to a remote HLR. + * (c) decision making to distinguish local IMSIs from ones proxied to a remote HLR. + * + * (1) mslookup is a method of finding subscribers using (multicast) queries, by MSISDN or by IMSI. + * It is open to various lookup methods, the first one being multicast DNS. + * An mslookup client sends a request, and an mslookup server responds. + * The mslookup server is implemented by osmo-hlr. mslookup clients are arbitrary programs, like an ESME or a SIP PBX. + * Hence the mslookup client is public API, while the mslookup server is implemented "privately" in osmo-hlr. + * + * (1a) Public mslookup client: libosmo-mslookup + * src/mslookup/mslookup.c Things useful for both client and server. + * src/mslookup/mslookup_client.c The client API, which can use various lookup methods, + * and consolidates results from various responders. + * src/mslookup/mslookup_client_mdns.c lookup method implementing multicast DNS, client side. + * + * src/mslookup/osmo-mslookup-client.c Utility program to ease invocation for (blocking) mslookup clients. + * + * src/mslookup/mslookup_client_fake.c lookup method generating fake results, for testing client implementations. + * + * src/mslookup/mdns*.c implementation of DNS to be used by mslookup_client_mdns.c, + * and the mslookup_server.c. + * + * contrib/dgsm/esme_dgsm.py Example implementation for an mslookup enabled SMS handler. + * contrib/dgsm/freeswitch_dialplan_dgsm.py Example implementation for an mslookup enabled FreeSWITCH dialplan. + * contrib/dgsm/osmo-mslookup-pipe.py Example for writing a python client using the osmo-mslookup-client + * cmdline. + * contrib/dgsm/osmo-mslookup-socket.py Example for writing a python client using the osmo-mslookup-client + * unix domain socket. + * + * (1b) "Private" mslookup server in osmo-hlr: + * src/mslookup_server.c Respond to mslookup queries, independent from the particular lookup method. + * src/mslookup_server_mdns.c mDNS specific implementation for mslookup_server.c. + * src/dgsm_vty.c Configure services that mslookup server sends to remote requests. + * + * (2) Proxy and GSUP clients to remote HLR instances: + * + * (a) Be a GSUP client to forward to a remote HLR: + * src/gsupclient/ The same API that is used by osmo-{msc,sgsn} is also used to forward GSUP to remote osmo-hlrs. + * src/remote_hlr.c Establish links to remote osmo-hlrs, where this osmo-hlr is a client (proxying e.g. for an MSC). + * + * (b) Keep track of remotely handled IMSIs: + * src/proxy.c Keep track of proxied IMSIs and cache important subscriber data. + * + * (c) Direct GSUP request to the right destination: either the local or a remote HLR: + * src/dgsm.c The glue that makes osmo-hlr distinguish between local IMSIs and those that are proxied to another + * osmo-hlr. + * src/dgsm_vty.c Config. + * + * @{ + * \file mslookup.c + */ + +const struct value_string osmo_mslookup_id_type_names[] = { + { OSMO_MSLOOKUP_ID_NONE, "none" }, + { OSMO_MSLOOKUP_ID_IMSI, "imsi" }, + { OSMO_MSLOOKUP_ID_MSISDN, "msisdn" }, + {} +}; + +const struct value_string osmo_mslookup_result_code_names[] = { + { OSMO_MSLOOKUP_RC_NONE, "none" }, + { OSMO_MSLOOKUP_RC_RESULT, "result" }, + { OSMO_MSLOOKUP_RC_NOT_FOUND, "not-found" }, + {} +}; + +/*! Compare two struct osmo_mslookup_id. + * \returns 0 if a and b are equal, + * < 0 if a (or the ID type / start of ID) is < b, + * > 0 if a (or the ID type / start of ID) is > b. + */ +int osmo_mslookup_id_cmp(const struct osmo_mslookup_id *a, const struct osmo_mslookup_id *b) +{ + int cmp; + if (a == b) + return 0; + if (!a) + return -1; + if (!b) + return 1; + + cmp = OSMO_CMP(a->type, b->type); + if (cmp) + return cmp; + + switch (a->type) { + case OSMO_MSLOOKUP_ID_IMSI: + return strncmp(a->imsi, b->imsi, sizeof(a->imsi)); + case OSMO_MSLOOKUP_ID_MSISDN: + return strncmp(a->msisdn, b->msisdn, sizeof(a->msisdn)); + default: + return 0; + } +} + +bool osmo_mslookup_id_valid(const struct osmo_mslookup_id *id) +{ + switch (id->type) { + case OSMO_MSLOOKUP_ID_IMSI: + return osmo_imsi_str_valid(id->imsi); + case OSMO_MSLOOKUP_ID_MSISDN: + return osmo_msisdn_str_valid(id->msisdn); + default: + return false; + } +} + +bool osmo_mslookup_service_valid(const char *service) +{ + return strlen(service) > 0; +} + +/*! Write ID and ID type to a buffer. + * \param[out] buf nul-terminated {id}.{id_type} string (e.g. "1234.msisdn") or +* "?.none" if the ID type is invalid. + * \returns amount of bytes written to buf. + */ +size_t osmo_mslookup_id_name_buf(char *buf, size_t buflen, const struct osmo_mslookup_id *id) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + switch (id->type) { + case OSMO_MSLOOKUP_ID_IMSI: + OSMO_STRBUF_PRINTF(sb, "%s", id->imsi); + break; + case OSMO_MSLOOKUP_ID_MSISDN: + OSMO_STRBUF_PRINTF(sb, "%s", id->msisdn); + break; + default: + OSMO_STRBUF_PRINTF(sb, "?"); + break; + } + OSMO_STRBUF_PRINTF(sb, ".%s", osmo_mslookup_id_type_name(id->type)); + return sb.chars_needed; +} + +/*! Same as osmo_mslookup_id_name_buf(), but return a talloc allocated string of sufficient size. */ +char *osmo_mslookup_id_name_c(void *ctx, const struct osmo_mslookup_id *id) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_mslookup_id_name_buf, id) +} + +/*! Same as osmo_mslookup_id_name_buf(), but directly return the char* (for printf-like string formats). */ +char *osmo_mslookup_id_name_b(char *buf, size_t buflen, const struct osmo_mslookup_id *id) +{ + int rc = osmo_mslookup_id_name_buf(buf, buflen, id); + if (rc < 0 && buflen) + buf[0] = '\0'; + return buf; +} + +/*! Write mslookup result string to buffer. + * \param[in] query with the service, ID and ID type to be written to buf like a domain string, or NULL to omit. + * \param[in] result with the result code, IPv4/v6 and age to be written to buf or NULL to omit. + * \param[out] buf result as flat string, which looks like the following for a valid query and result with IPv4 and v6 + * answer: "sip.voice.1234.msisdn -> ipv4: 42.42.42.42:1337 -> ipv6: [1234:5678:9ABC::]:1338 (age=1)", + * the result part can also be " -> timeout" or " -> rc=5" depending on the result code. + * \returns amount of bytes written to buf. + */ +size_t osmo_mslookup_result_to_str_buf(char *buf, size_t buflen, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + if (query) { + OSMO_STRBUF_PRINTF(sb, "%s.", query->service); + OSMO_STRBUF_APPEND(sb, osmo_mslookup_id_name_buf, &query->id); + } + if (result && result->rc == OSMO_MSLOOKUP_RC_NONE) + result = NULL; + if (result) { + if (result->rc != OSMO_MSLOOKUP_RC_RESULT) { + OSMO_STRBUF_PRINTF(sb, " %s", osmo_mslookup_result_code_name(result->rc)); + } else { + if (result->host_v4.ip[0]) { + OSMO_STRBUF_PRINTF(sb, " -> ipv4: " OSMO_SOCKADDR_STR_FMT, + OSMO_SOCKADDR_STR_FMT_ARGS(&result->host_v4)); + } + if (result->host_v6.ip[0]) { + OSMO_STRBUF_PRINTF(sb, " -> ipv6: " OSMO_SOCKADDR_STR_FMT, + OSMO_SOCKADDR_STR_FMT_ARGS(&result->host_v6)); + } + OSMO_STRBUF_PRINTF(sb, " (age=%u)", result->age); + } + OSMO_STRBUF_PRINTF(sb, " %s", result->last ? "(last)" : "(not-last)"); + } + return sb.chars_needed; +} + +/*! Same as osmo_mslookup_result_to_str_buf(), but return a talloc allocated string of sufficient size. */ +char *osmo_mslookup_result_name_c(void *ctx, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_mslookup_result_to_str_buf, query, result) +} + +/*! Same as osmo_mslookup_result_to_str_buf(), but directly return the char* (for printf-like string formats). */ +char *osmo_mslookup_result_name_b(char *buf, size_t buflen, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + int rc = osmo_mslookup_result_to_str_buf(buf, buflen, query, result); + if (rc < 0 && buflen) + buf[0] = '\0'; + return buf; +} + +/*! Copy part of a string to a buffer and nul-terminate it. + * \returns 0 on success, negative on error. + */ +static int token(char *dest, size_t dest_size, const char *start, const char *end) +{ + int len; + if (start >= end) + return -10; + len = end - start; + if (len >= dest_size) + return -11; + strncpy(dest, start, len); + dest[len] = '\0'; + return 0; +} + +/*! Parse a string like "foo.moo.goo.123456789012345.msisdn" into service="foo.moo.goo", id="123456789012345" and + * id_type="msisdn", placed in a struct osmo_mslookup_query. + * \param q Write parsed query to this osmo_mslookup_query. + * \param domain Human readable domain string like "sip.voice.12345678.msisdn". + * \returns 0 on success, negative on error. + */ +int osmo_mslookup_query_init_from_domain_str(struct osmo_mslookup_query *q, const char *domain) +{ + const char *last_dot; + const char *second_last_dot; + const char *id_type; + const char *id; + int rc; + + *q = (struct osmo_mslookup_query){}; + + if (!domain) + return -1; + + last_dot = strrchr(domain, '.'); + + if (!last_dot) + return -2; + + if (last_dot <= domain) + return -3; + + for (second_last_dot = last_dot - 1; second_last_dot > domain && *second_last_dot != '.'; second_last_dot--); + if (second_last_dot == domain || *second_last_dot != '.') + return -3; + + id_type = last_dot + 1; + if (!*id_type) + return -4; + + q->id.type = get_string_value(osmo_mslookup_id_type_names, id_type); + + id = second_last_dot + 1; + switch (q->id.type) { + case OSMO_MSLOOKUP_ID_IMSI: + rc = token(q->id.imsi, sizeof(q->id.imsi), id, last_dot); + if (rc) + return rc; + if (!osmo_imsi_str_valid(q->id.imsi)) + return -5; + break; + case OSMO_MSLOOKUP_ID_MSISDN: + rc = token(q->id.msisdn, sizeof(q->id.msisdn), id, last_dot); + if (rc) + return rc; + if (!osmo_msisdn_str_valid(q->id.msisdn)) + return -6; + break; + default: + return -7; + } + + return token(q->service, sizeof(q->service), domain, second_last_dot); +} + +/*! @} */ diff --git a/src/mslookup/mslookup_client.c b/src/mslookup/mslookup_client.c new file mode 100644 index 0000000..67977e4 --- /dev/null +++ b/src/mslookup/mslookup_client.c @@ -0,0 +1,310 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include + +/*! Lookup client's internal data for a query. */ +struct osmo_mslookup_client { + struct llist_head lookup_methods; + struct llist_head requests; + uint32_t next_request_handle; +}; + +/*! Lookup client's internal data for a query. + * The request methods only get to see the query part, and result handling is done commonly for all request methods. */ +struct osmo_mslookup_client_request { + struct llist_head entry; + struct osmo_mslookup_client *client; + uint32_t request_handle; + + struct osmo_mslookup_query query; + struct osmo_mslookup_query_handling handling; + struct osmo_timer_list timeout; + bool waiting_min_delay; + + struct osmo_mslookup_result result; +}; + +static struct osmo_mslookup_client_request *get_request(struct osmo_mslookup_client *client, uint32_t request_handle) +{ + struct osmo_mslookup_client_request *r; + if (!request_handle) + return NULL; + llist_for_each_entry(r, &client->requests, entry) { + if (r->request_handle == request_handle) + return r; + } + return NULL; +} + +struct osmo_mslookup_client *osmo_mslookup_client_new(void *ctx) +{ + struct osmo_mslookup_client *client = talloc_zero(ctx, struct osmo_mslookup_client); + OSMO_ASSERT(client); + INIT_LLIST_HEAD(&client->lookup_methods); + INIT_LLIST_HEAD(&client->requests); + return client; +} + +/*! Return whether any lookup methods are available. + * \param[in] client Client to query. + * \return true when a client is present that has at least one osmo_mslookup_client_method registered. + */ +bool osmo_mslookup_client_active(struct osmo_mslookup_client *client) +{ + if (!client) + return false; + if (llist_empty(&client->lookup_methods)) + return false; + return true; +} + +static void _osmo_mslookup_client_method_del(struct osmo_mslookup_client_method *method) +{ + if (method->destruct) + method->destruct(method); + llist_del(&method->entry); + talloc_free(method); +} + +/*! Stop and free mslookup client and all registered lookup methods. + */ +void osmo_mslookup_client_free(struct osmo_mslookup_client *client) +{ + struct osmo_mslookup_client_method *m, *n; + if (!client) + return; + llist_for_each_entry_safe(m, n, &client->lookup_methods, entry) { + _osmo_mslookup_client_method_del(m); + } + talloc_free(client); +} + +/*! Add an osmo_mslookup_client_method to service MS Lookup requests. + * Note, osmo_mslookup_client_method_del() will talloc_free() the method pointer, so it needs to be dynamically + * allocated. + * \param client The osmo_mslookup_client instance to add to. + * \param method A fully initialized method struct, allocated by talloc. + */ +void osmo_mslookup_client_method_add(struct osmo_mslookup_client *client, + struct osmo_mslookup_client_method *method) +{ + method->client = client; + llist_add_tail(&method->entry, &client->lookup_methods); +} + +/*! \return false if the method was not listed, true if the method was listed, removed and talloc_free()d. + */ +bool osmo_mslookup_client_method_del(struct osmo_mslookup_client *client, + struct osmo_mslookup_client_method *method) +{ + struct osmo_mslookup_client_method *m; + llist_for_each_entry(m, &client->lookup_methods, entry) { + if (m == method) { + _osmo_mslookup_client_method_del(method); + return true; + } + } + return false; +} + +static void osmo_mslookup_request_send_result(struct osmo_mslookup_client_request *r, bool finish) +{ + struct osmo_mslookup_client *client = r->client; + uint32_t request_handle = r->request_handle; + + r->result.last = finish; + r->handling.result_cb(r->client, r->request_handle, &r->query, &r->result); + + /* Make sure the request struct is discarded. + * The result_cb() may already have triggered a cleanup, so query by request_handle. */ + if (finish) + osmo_mslookup_client_request_cancel(client, request_handle); +} + +void osmo_mslookup_client_rx_result(struct osmo_mslookup_client *client, uint32_t request_handle, + const struct osmo_mslookup_result *result) +{ + struct osmo_mslookup_client_request *req = get_request(client, request_handle); + + if (!req) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "Internal error: Got mslookup result for a request that does not exist (handle %u)\n", + req->request_handle); + return; + } + + /* Ignore incoming results that are not successful */ + if (result->rc != OSMO_MSLOOKUP_RC_RESULT) + return; + + /* If we already stored an earlier successful result, keep that if its age is younger. */ + if (req->result.rc == OSMO_MSLOOKUP_RC_RESULT + && result->age >= req->result.age) + return; + + req->result = *result; + + /* If age == 0, it doesn't get any better, so return the result immediately. */ + if (req->result.age == 0) { + osmo_mslookup_request_send_result(req, true); + return; + } + + if (req->waiting_min_delay) + return; + + osmo_mslookup_request_send_result(req, false); +} + +static void _osmo_mslookup_client_request_cleanup(struct osmo_mslookup_client_request *r) +{ + struct osmo_mslookup_client_method *m; + osmo_timer_del(&r->timeout); + llist_for_each_entry(m, &r->client->lookup_methods, entry) { + if (!m->request_cleanup) + continue; + m->request_cleanup(m, r->request_handle); + } + llist_del(&r->entry); + talloc_free(r); +} + +static void timeout_cb(void *data); + +static void set_timer(struct osmo_mslookup_client_request *r, unsigned long milliseconds) +{ + osmo_timer_setup(&r->timeout, timeout_cb, r); + osmo_timer_schedule(&r->timeout, milliseconds / 1000, (milliseconds % 1000) * 1000); +} + +static void timeout_cb(void *data) +{ + struct osmo_mslookup_client_request *r = data; + if (r->waiting_min_delay) { + /* The initial delay has passed. See if it stops here, or whether the overall timeout continues. */ + r->waiting_min_delay = false; + + if (r->handling.result_timeout_milliseconds <= r->handling.min_wait_milliseconds) { + /* It ends here. Return a final result. */ + if (r->result.rc != OSMO_MSLOOKUP_RC_RESULT) + r->result.rc = OSMO_MSLOOKUP_RC_NOT_FOUND; + osmo_mslookup_request_send_result(r, true); + return; + } + + /* We continue to listen for results. If one is already on record, send it now. */ + if (r->result.rc == OSMO_MSLOOKUP_RC_RESULT) + osmo_mslookup_request_send_result(r, false); + + set_timer(r, r->handling.result_timeout_milliseconds - r->handling.min_wait_milliseconds); + return; + } + /* The final timeout has passed, finish and clean up the request. */ + switch (r->result.rc) { + case OSMO_MSLOOKUP_RC_RESULT: + /* If the rc == OSMO_MSLOOKUP_RC_RESULT, this result has already been sent. + * Don't send it again, instead send an RC_NONE, last=true result. */ + r->result.rc = OSMO_MSLOOKUP_RC_NONE; + break; + default: + r->result.rc = OSMO_MSLOOKUP_RC_NOT_FOUND; + break; + } + osmo_mslookup_request_send_result(r, true); +} + +/*! Launch a subscriber lookup with the provided query. + * A request is cleared implicitly when the handling->result_cb is invoked; if the quer->priv pointer becomes invalid + * before that, a request should be canceled by calling osmo_mslookup_client_request_cancel() with the returned + * request_handle. A request handle of zero indicates error. + * \return a nonzero request_handle that allows ending the request, or 0 on invalid query data. */ +uint32_t osmo_mslookup_client_request(struct osmo_mslookup_client *client, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_query_handling *handling) +{ + struct osmo_mslookup_client_request *r; + struct osmo_mslookup_client_request *other; + struct osmo_mslookup_client_method *m; + + if (!osmo_mslookup_service_valid(query->service) + || !osmo_mslookup_id_valid(&query->id)) { + char buf[256]; + LOGP(DMSLOOKUP, LOGL_ERROR, "Invalid query: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + return 0; + } + + r = talloc_zero(client, struct osmo_mslookup_client_request); + OSMO_ASSERT(r); + + /* A request_handle of zero means error, so make sure we don't use a zero handle. */ + if (!client->next_request_handle) + client->next_request_handle++; + *r = (struct osmo_mslookup_client_request){ + .client = client, + .query = *query, + .handling = *handling, + .request_handle = client->next_request_handle++, + }; + + if (!r->handling.result_timeout_milliseconds) + r->handling.result_timeout_milliseconds = r->handling.min_wait_milliseconds; + if (!r->handling.result_timeout_milliseconds) + r->handling.result_timeout_milliseconds = 1000; + + /* Paranoia: make sure a request_handle exists only once, by expiring an already existing one. This is unlikely + * to happen in practice: before we get near wrapping a uint32_t range, previous requests should long have + * timed out or ended. */ + llist_for_each_entry(other, &client->requests, entry) { + if (other->request_handle != r->request_handle) + continue; + osmo_mslookup_request_send_result(other, true); + /* we're sure it exists only once. */ + break; + } + + /* Now sure that the new request_handle does not exist a second time. */ + llist_add_tail(&r->entry, &client->requests); + + if (r->handling.min_wait_milliseconds) { + r->waiting_min_delay = true; + set_timer(r, r->handling.min_wait_milliseconds); + } else { + set_timer(r, r->handling.result_timeout_milliseconds); + } + + /* Let the lookup implementations know */ + llist_for_each_entry(m, &client->lookup_methods, entry) { + m->request(m, query, r->request_handle); + } + return r->request_handle; +} + +/*! End or cancel a subscriber lookup. This *must* be invoked exactly once per osmo_mslookup_client_request() invocation, + * either after a lookup has concluded or to abort an ongoing lookup. + * \param[in] request_handle The request_handle returned by an osmo_mslookup_client_request() invocation. + */ +void osmo_mslookup_client_request_cancel(struct osmo_mslookup_client *client, uint32_t request_handle) +{ + struct osmo_mslookup_client_request *r = get_request(client, request_handle); + if (!r) + return; + _osmo_mslookup_client_request_cleanup(r); +} diff --git a/src/mslookup/mslookup_client_fake.c b/src/mslookup/mslookup_client_fake.c new file mode 100644 index 0000000..cae73f2 --- /dev/null +++ b/src/mslookup/mslookup_client_fake.c @@ -0,0 +1,156 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include + +#include + +/* Fake mslookup method */ + +struct fake_lookup_state { + struct osmo_mslookup_client *client; + struct llist_head requests; + struct osmo_timer_list async_response_timer; + struct osmo_mslookup_fake_response *responses; + size_t responses_len; +}; + +struct fake_lookup_request { + struct llist_head entry; + uint32_t request_handle; + struct osmo_mslookup_query query; + struct timeval received_at; +}; + +/*! Args for osmo_timer_schedule: seconds and microseconds. */ +#define ASYNC_RESPONSE_PERIOD 0, (1e6 / 10) +static void fake_lookup_async_response(void *state); + +static void fake_lookup_request(struct osmo_mslookup_client_method *method, + const struct osmo_mslookup_query *query, + uint32_t request_handle) +{ + struct fake_lookup_state *state = method->priv; + char buf[256]; + LOGP(DMSLOOKUP, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + + /* A real implementation would send packets to some remote server. + * Here this is simulated: add to the list of requests, which fake_lookup_async_response() will reply upon + * according to the test data listing the replies that the test wants to generate. */ + + struct fake_lookup_request *r = talloc_zero(method->client, struct fake_lookup_request); + *r = (struct fake_lookup_request){ + .request_handle = request_handle, + .query = *query, + }; + osmo_gettimeofday(&r->received_at, NULL); + llist_add_tail(&r->entry, &state->requests); +} + +static void fake_lookup_request_cleanup(struct osmo_mslookup_client_method *method, + uint32_t request_handle) +{ + struct fake_lookup_state *state = method->priv; + + /* Tear down any state associated with this handle. */ + struct fake_lookup_request *r; + llist_for_each_entry(r, &state->requests, entry) { + if (r->request_handle != request_handle) + continue; + llist_del(&r->entry); + talloc_free(r); + LOGP(DMSLOOKUP, LOGL_DEBUG, "%s() ok\n", __func__); + return; + } + LOGP(DMSLOOKUP, LOGL_DEBUG, "%s() FAILED\n", __func__); +} + +static void fake_lookup_async_response(void *data) +{ + struct fake_lookup_state *state = data; + struct fake_lookup_request *req, *n; + struct timeval now; + char str[256]; + + osmo_gettimeofday(&now, NULL); + + llist_for_each_entry_safe(req, n, &state->requests, entry) { + struct osmo_mslookup_fake_response *resp; + + for (resp = state->responses; + (resp - state->responses) < state->responses_len; + resp++) { + struct timeval diff; + + if (resp->sent) + continue; + if (osmo_mslookup_id_cmp(&req->query.id, &resp->for_id) != 0) + continue; + if (strcmp(req->query.service, resp->for_service) != 0) + continue; + + timersub(&now, &req->received_at, &diff); + if (timercmp(&diff, &resp->time_to_reply, <)) + continue; + + /* It's time to reply to this request. */ + LOGP(DMSLOOKUP, LOGL_DEBUG, "osmo_mslookup_client_rx_result(): %s\n", + osmo_mslookup_result_name_b(str, sizeof(str), &req->query, &resp->result)); + osmo_mslookup_client_rx_result(state->client, req->request_handle, &resp->result); + resp->sent = true; + + /* The req will have been cleaned up now, so we must not iterate over state->responses anymore + * with this req. */ + break; + } + } + + osmo_timer_schedule(&state->async_response_timer, ASYNC_RESPONSE_PERIOD); +} + +struct osmo_mslookup_client_method *osmo_mslookup_client_add_fake(struct osmo_mslookup_client *client, + struct osmo_mslookup_fake_response *responses, + size_t responses_len) +{ + struct osmo_mslookup_client_method *method = talloc_zero(client, struct osmo_mslookup_client_method); + OSMO_ASSERT(method); + + struct fake_lookup_state *state = talloc_zero(method, struct fake_lookup_state); + OSMO_ASSERT(state); + *state = (struct fake_lookup_state){ + .client = client, + .responses = responses, + .responses_len = responses_len, + }; + INIT_LLIST_HEAD(&state->requests); + + *method = (struct osmo_mslookup_client_method){ + .name = "fake", + .priv = state, + .request = fake_lookup_request, + .request_cleanup = fake_lookup_request_cleanup, + }; + + osmo_timer_setup(&state->async_response_timer, fake_lookup_async_response, state); + osmo_mslookup_client_method_add(client, method); + + osmo_timer_schedule(&state->async_response_timer, ASYNC_RESPONSE_PERIOD); + return method; +} diff --git a/tests/Makefile.am b/tests/Makefile.am index f8591a5..776f8a9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ gsup_server \ db \ db_upgrade \ + mslookup \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am new file mode 100644 index 0000000..71602a3 --- /dev/null +++ b/tests/mslookup/Makefile.am @@ -0,0 +1,49 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + -I$(top_srcdir)/include \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + -no-install \ + $(NULL) + +EXTRA_DIST = \ + mslookup_client_test.err \ + mslookup_test.err \ + $(NULL) + +check_PROGRAMS = \ + mslookup_client_test \ + mslookup_test \ + $(NULL) + +mslookup_test_SOURCES = \ + mslookup_test.c \ + $(NULL) +mslookup_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +mslookup_client_test_SOURCES = \ + mslookup_client_test.c \ + $(NULL) +mslookup_client_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +.PHONY: update_exp +update_exp: + for i in $(check_PROGRAMS); do \ + echo "Updating $$i.err"; \ + $(builddir)/$$i 2>"$(srcdir)/$$i.err"; \ + done diff --git a/tests/mslookup/mslookup_client_test.c b/tests/mslookup/mslookup_client_test.c new file mode 100644 index 0000000..40be011 --- /dev/null +++ b/tests/mslookup/mslookup_client_test.c @@ -0,0 +1,245 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include + +#define SERVICE_HLR_GSUP "gsup.hlr" +#define SERVICE_SIP "sip.voice" + +void *ctx = NULL; + +static struct osmo_mslookup_fake_response fake_lookup_responses[] = { + { + .time_to_reply = { .tv_sec = 1, }, + .for_id = { + .type = OSMO_MSLOOKUP_ID_IMSI, + .imsi = "1234567", + }, + .for_service = SERVICE_HLR_GSUP, + .result = { + .rc = OSMO_MSLOOKUP_RC_RESULT, + .host_v4 = { + .af = AF_INET, + .ip = "12.34.56.7", + .port = 42, + }, + .host_v6 = { + .af = AF_INET6, + .ip = "be:ef:ed:ca:fe:fa:ce::1", + .port = 42, + }, + .age = 0, + }, + }, + { + .time_to_reply = { .tv_usec = 600 * 1000, }, + .for_id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "112", + }, + .for_service = SERVICE_SIP, + .result = { + .rc = OSMO_MSLOOKUP_RC_RESULT, + .host_v4 = { + .af = AF_INET, + .ip = "66.66.66.66", + .port = 666, + }, + .host_v6 = { + .af = AF_INET, + .ip = "6666:6666:6666::6", + .port = 666, + }, + .age = 423, + }, + }, + { + .time_to_reply = { .tv_usec = 800 * 1000, }, + .for_id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "112", + }, + .for_service = SERVICE_SIP, + .result = { + .rc = OSMO_MSLOOKUP_RC_RESULT, + .host_v4 = { + .af = AF_INET, + .ip = "112.112.112.112", + .port = 23, + }, + .age = 235, + }, + }, + { + .time_to_reply = { .tv_sec = 1, .tv_usec = 200 * 1000, }, + .for_id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "112", + }, + .for_service = SERVICE_SIP, + .result = { + .rc = OSMO_MSLOOKUP_RC_RESULT, + .host_v4 = { + .af = AF_INET, + .ip = "99.99.99.99", + .port = 999, + }, + .host_v6 = { + .af = AF_INET, + .ip = "9999:9999:9999::9", + .port = 999, + }, + .age = 335, + }, + }, + { + .time_to_reply = { .tv_sec = 1, .tv_usec = 500 * 1000, }, + .for_id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "112", + }, + .for_service = SERVICE_SIP, + .result = { + .rc = OSMO_MSLOOKUP_RC_RESULT, + .host_v4 = { + .af = AF_INET, + .ip = "99.99.99.99", + .port = 999, + }, + .age = 999, + }, + }, +}; + +const struct timeval fake_time_start_time = { 0, 0 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +static void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} + +static void result_cb_once(struct osmo_mslookup_client *client, + uint32_t request_handle, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + LOGP(DMSLOOKUP, LOGL_DEBUG, "result_cb(): %s\n", osmo_mslookup_result_name_c(ctx, query, result)); +} + +int main() +{ + ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); + + fake_time_start(); + + struct osmo_mslookup_client *client = osmo_mslookup_client_new(ctx); + osmo_mslookup_client_add_fake(client, fake_lookup_responses, ARRAY_SIZE(fake_lookup_responses)); + + /* Place some requests to be replied upon asynchronously */ + + struct osmo_mslookup_query_handling handling = { + .result_timeout_milliseconds = 1, /* set some timeout < min_wait_milliseconds */ + .min_wait_milliseconds = 2000, + .result_cb = result_cb_once, + }; + + struct osmo_mslookup_query q1 = { + .service = SERVICE_HLR_GSUP, + .id = { + .type = OSMO_MSLOOKUP_ID_IMSI, + .imsi = "1234567", + }, + }; + OSMO_ASSERT(osmo_mslookup_client_request(client, &q1, &handling)); + + struct osmo_mslookup_query q2 = { + .service = SERVICE_SIP, + .id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "112", + }, + }; + handling.min_wait_milliseconds = 3000; + OSMO_ASSERT(osmo_mslookup_client_request(client, &q2, &handling)); + + struct osmo_mslookup_query q3 = { + .service = "smpp.sms", + .id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "00000", + }, + }; + handling.min_wait_milliseconds = 5000; + OSMO_ASSERT(osmo_mslookup_client_request(client, &q3, &handling)); + + struct osmo_mslookup_query q4 = { + .service = SERVICE_HLR_GSUP, + .id = { + .type = OSMO_MSLOOKUP_ID_MSISDN, + .msisdn = "666", + }, + }; + handling.min_wait_milliseconds = 10000; + uint32_t q4_handle; + OSMO_ASSERT((q4_handle = osmo_mslookup_client_request(client, &q4, &handling))); + + while (osmo_gettimeofday_override_time.tv_sec < 6) { + log_reset_context(); + fake_time_passes(0, 1e6 / 5); + } + + osmo_mslookup_client_request_cancel(client, q4_handle); + + return 0; +} diff --git a/tests/mslookup/mslookup_client_test.err b/tests/mslookup/mslookup_client_test.err new file mode 100644 index 0000000..c552837 --- /dev/null +++ b/tests/mslookup/mslookup_client_test.err @@ -0,0 +1,47 @@ +Total time passed: 0.000000 s +fake_lookup_request(gsup.hlr.1234567.imsi) +fake_lookup_request(sip.voice.112.msisdn) +fake_lookup_request(smpp.sms.00000.msisdn) +fake_lookup_request(gsup.hlr.666.msisdn) +Total time passed: 0.200000 s +Total time passed: 0.400000 s +Total time passed: 0.600000 s +osmo_mslookup_client_rx_result(): sip.voice.112.msisdn -> ipv4: 66.66.66.66:666 -> ipv6: 6666:6666:6666::6:666 (age=423) (not-last) +Total time passed: 0.800000 s +osmo_mslookup_client_rx_result(): sip.voice.112.msisdn -> ipv4: 112.112.112.112:23 (age=235) (not-last) +Total time passed: 1.000000 s +osmo_mslookup_client_rx_result(): gsup.hlr.1234567.imsi -> ipv4: 12.34.56.7:42 -> ipv6: [be:ef:ed:ca:fe:fa:ce::1]:42 (age=0) (not-last) +result_cb(): gsup.hlr.1234567.imsi -> ipv4: 12.34.56.7:42 -> ipv6: [be:ef:ed:ca:fe:fa:ce::1]:42 (age=0) (last) +fake_lookup_request_cleanup() ok +Total time passed: 1.200000 s +osmo_mslookup_client_rx_result(): sip.voice.112.msisdn -> ipv4: 99.99.99.99:999 -> ipv6: 9999:9999:9999::9:999 (age=335) (not-last) +Total time passed: 1.400000 s +Total time passed: 1.600000 s +osmo_mslookup_client_rx_result(): sip.voice.112.msisdn -> ipv4: 99.99.99.99:999 (age=999) (not-last) +Total time passed: 1.800000 s +Total time passed: 2.000000 s +Total time passed: 2.200000 s +Total time passed: 2.400000 s +Total time passed: 2.600000 s +Total time passed: 2.800000 s +Total time passed: 3.000000 s +result_cb(): sip.voice.112.msisdn -> ipv4: 112.112.112.112:23 (age=235) (last) +fake_lookup_request_cleanup() ok +Total time passed: 3.200000 s +Total time passed: 3.400000 s +Total time passed: 3.600000 s +Total time passed: 3.800000 s +Total time passed: 4.000000 s +Total time passed: 4.200000 s +Total time passed: 4.400000 s +Total time passed: 4.600000 s +Total time passed: 4.800000 s +Total time passed: 5.000000 s +result_cb(): smpp.sms.00000.msisdn not-found (last) +fake_lookup_request_cleanup() ok +Total time passed: 5.200000 s +Total time passed: 5.400000 s +Total time passed: 5.600000 s +Total time passed: 5.800000 s +Total time passed: 6.000000 s +fake_lookup_request_cleanup() ok diff --git a/tests/mslookup/mslookup_test.c b/tests/mslookup/mslookup_test.c new file mode 100644 index 0000000..1672bd0 --- /dev/null +++ b/tests/mslookup/mslookup_test.c @@ -0,0 +1,88 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include + +void *ctx; + +const char *domains[] = { + "gsup.hlr.123456789012345.imsi", + "gsup.hlr.1.imsi", + "sip.voice.1.msisdn", + "a.b.c.imsi", + "", + ".", + "...", + ".....", + ".....1.msisdn", + "fofdndsf. d.ads ofdsf. ads.kj.1243455132.msisdn", + "foo.12345678901234567890.imsi", + "gsup.hlr.123456789012345.what", + NULL, + "blarg", + "blarg.", + "blarg.1.", + "blarg.1.msisdn", + "blarg.1.msisdn.", + ".1.msisdn", + "1.msisdn", + "qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmm.1.msisdn", + "qwerty.1.qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmm", +}; + +void test_osmo_mslookup_query_init_from_domain_str() +{ + int i; + for (i = 0; i < ARRAY_SIZE(domains); i++) { + const char *d = domains[i]; + struct osmo_mslookup_query q; + + int rc = osmo_mslookup_query_init_from_domain_str(&q, d); + if (rc) + fprintf(stderr, "%s -> rc = %d\n", osmo_quote_str(d, -1), rc); + else + fprintf(stderr, "%s -> %s %s %s\n", osmo_quote_str(d, -1), + osmo_quote_str_c(ctx, q.service, -1), + osmo_quote_str_c(ctx, q.id.imsi, -1), + osmo_mslookup_id_type_name(q.id.type)); + } +} + +int main() +{ + ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); + + test_osmo_mslookup_query_init_from_domain_str(); + + talloc_free(ctx); + + return 0; +} diff --git a/tests/mslookup/mslookup_test.err b/tests/mslookup/mslookup_test.err new file mode 100644 index 0000000..ee5ff21 --- /dev/null +++ b/tests/mslookup/mslookup_test.err @@ -0,0 +1,22 @@ +"gsup.hlr.123456789012345.imsi" -> "gsup.hlr" "123456789012345" imsi +"gsup.hlr.1.imsi" -> rc = -5 +"sip.voice.1.msisdn" -> "sip.voice" "1" msisdn +"a.b.c.imsi" -> rc = -5 +"" -> rc = -2 +"." -> rc = -3 +"..." -> rc = -4 +"....." -> rc = -4 +".....1.msisdn" -> "...." "1" msisdn +"fofdndsf. d.ads ofdsf. ads.kj.1243455132.msisdn" -> "fofdndsf. d.ads ofdsf. ads.kj" "1243455132" msisdn +"foo.12345678901234567890.imsi" -> rc = -11 +"gsup.hlr.123456789012345.what" -> rc = -7 +NULL -> rc = -1 +"blarg" -> rc = -2 +"blarg." -> rc = -3 +"blarg.1." -> rc = -4 +"blarg.1.msisdn" -> "blarg" "1" msisdn +"blarg.1.msisdn." -> rc = -4 +".1.msisdn" -> rc = -3 +"1.msisdn" -> rc = -3 +"qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmm.1.msisdn" -> rc = -11 +"qwerty.1.qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnmm" -> rc = -7 diff --git a/tests/testsuite.at b/tests/testsuite.at index 58c197d..39df7aa 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -39,3 +39,15 @@ cat $abs_srcdir/db_upgrade/db_upgrade_test.err > experr AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP + +AT_SETUP([mslookup]) +AT_KEYWORDS([mslookup]) +cat $abs_srcdir/mslookup/mslookup_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_test], [0], [ignore], [experr]) +AT_CLEANUP + +AT_SETUP([mslookup_client]) +AT_KEYWORDS([mslookup_client]) +cat $abs_srcdir/mslookup/mslookup_client_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:07:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:07:41 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... add mDNS lookup method to libosmo-mslookup Add the first actually useful lookup method to the mslookup library: multicast DNS. The server side is added in a subsequent commit, when the mslookup server is implemented for the osmo-hlr program. Use custom DNS encoding instead of libc-ares (which we use in OsmoSGSN already), because libc-ares is only a DNS client implementation and we will need both client and server. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am A include/osmocom/mslookup/Makefile.am A include/osmocom/mslookup/mdns.h A include/osmocom/mslookup/mdns_msg.h A include/osmocom/mslookup/mdns_rfc.h A include/osmocom/mslookup/mdns_sock.h A include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am A src/mslookup/mdns.c A src/mslookup/mdns_msg.c A src/mslookup/mdns_rfc.c A src/mslookup/mdns_sock.c A src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am A tests/mslookup/mdns_test.c A tests/mslookup/mdns_test.err A tests/mslookup/mslookup_client_mdns_test.c A tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 2,829 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index acfea84..eec364a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,8 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump +tests/mslookup/mdns_test +tests/mslookup/mslookup_client_mdns_test tests/mslookup/mslookup_client_test tests/mslookup/mslookup_test diff --git a/configure.ac b/configure.ac index 217df9f..57aecba 100644 --- a/configure.ac +++ b/configure.ac @@ -178,6 +178,7 @@ include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile + include/osmocom/mslookup/Makefile libosmo-gsup-client.pc libosmo-mslookup.pc sql/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index e9a7126..9827950 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,10 @@ nobase_include_HEADERS = \ osmocom/gsupclient/gsup_client.h \ + osmocom/mslookup/mdns.h \ + osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ + osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index dbc2344..b75c86a 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ hlr \ + mslookup \ $(NULL) diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am new file mode 100644 index 0000000..72ccd94 --- /dev/null +++ b/include/osmocom/mslookup/Makefile.am @@ -0,0 +1,6 @@ +# most headers here are installed, see /include/Makefile.am + +noinst_HEADERS = \ + mdns_msg.h \ + mdns_rfc.h \ + $(NULL) diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h new file mode 100644 index 0000000..b62e95f --- /dev/null +++ b/include/osmocom/mslookup/mdns.h @@ -0,0 +1,39 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/*! \file mdns.h */ + +#pragma once + +#include +#include + +#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org" + +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix); + +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix); + +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix); + +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix); diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h new file mode 100644 index 0000000..ae7dd17 --- /dev/null +++ b/include/osmocom/mslookup/mdns_msg.h @@ -0,0 +1,54 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include "mdns_rfc.h" + +struct osmo_mdns_record { + struct llist_head list; + enum osmo_mdns_rfc_record_type type; + uint16_t length; + uint8_t *data; +}; + +struct osmo_mdns_msg_request { + uint16_t id; + char *domain; + enum osmo_mdns_rfc_record_type type; +}; + +struct osmo_mdns_msg_answer { + uint16_t id; + char *domain; + /*! list of osmo_mdns_record. */ + struct llist_head records; +}; + +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req); +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len); + +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer); +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans); +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len); +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans); + +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...); +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size); diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h new file mode 100644 index 0000000..9d6be5a --- /dev/null +++ b/include/osmocom/mslookup/mdns_rfc.h @@ -0,0 +1,113 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include + +/* RFC 1035 2.3.4 */ +#define OSMO_MDNS_RFC_MAX_NAME_LEN 255 + +/* RFC 1035 3.3 */ +#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256 + +enum osmo_mdns_rfc_record_type { + OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0, + + /* RFC 1035 3.2.2 */ + OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */ + OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */ + + /* RFC 3596 2.1 */ + OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */ + + /* RFC 1035 3.2.3 */ + OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */ +}; + +enum osmo_mdns_rfc_class { + OSMO_MDNS_RFC_CLASS_UNKNOWN = 0, + + /* RFC 1035 3.2.4 */ + OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */ + + /* RFC 1035 3.2.5 */ + OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */ +}; + +/* RFC 1035 4.1.1 */ +struct osmo_mdns_rfc_header { +#if OSMO_IS_LITTLE_ENDIAN + uint16_t id; + uint8_t rd:1, + tc:1, + aa:1, + opcode:4, + qr:1; /* QR (0: query, 1: response) */ + uint8_t rcode:4, + z:3, + ra:1; + uint16_t qdcount; /* Number of questions */ + uint16_t ancount; /* Number of answers */ + uint16_t nscount; /* Number of authority records */ + uint16_t arcount; /* Number of additional records */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t id; + uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1; + uint8_t ra:1, z:3, rcode:4; + uint16_t qdcount; + uint16_t ancount; + uint16_t nscount; + uint16_t arcount; +#endif +} __attribute__ ((packed)); + +/* RFC 1035 4.1.2 */ +struct osmo_mdns_rfc_question { + char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type qtype; + enum osmo_mdns_rfc_class qclass; +}; + +/* RFC 1035 4.1.3 */ +struct osmo_mdns_rfc_record { + char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type type; + enum osmo_mdns_rfc_class class; + uint32_t ttl; + uint16_t rdlength; + uint8_t *rdata; +}; + +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); + +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); + +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); + +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len); diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h new file mode 100644 index 0000000..615e971 --- /dev/null +++ b/include/osmocom/mslookup/mdns_sock.h @@ -0,0 +1,33 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once +#include +#include +#include + +struct osmo_mdns_sock { + struct osmo_fd osmo_fd; + struct addrinfo *ai; +}; + +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr); +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg); +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock); diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h new file mode 100644 index 0000000..e699107 --- /dev/null +++ b/include/osmocom/mslookup/mslookup_client_mdns.h @@ -0,0 +1,38 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include + +struct osmo_mslookup_client; +struct osmo_mslookup_client_method; + +/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational + * Scoped range, https://tools.ietf.org/html/rfc2365 . */ +#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42" +#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane? +#define OSMO_MSLOOKUP_MDNS_PORT 4266 + +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix); + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method); + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method); diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 01be401..07fb6f4 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -10,9 +10,14 @@ lib_LTLIBRARIES = libosmo-mslookup.la libosmo_mslookup_la_SOURCES = \ + mdns.c \ + mdns_msg.c \ + mdns_rfc.c \ + mdns_sock.c \ mslookup.c \ mslookup_client.c \ mslookup_client_fake.c \ + mslookup_client_mdns.c \ $(NULL) libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c new file mode 100644 index 0000000..4742a7c --- /dev/null +++ b/src/mslookup/mdns.c @@ -0,0 +1,425 @@ +/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high + * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +static struct msgb *osmo_mdns_msgb_alloc(const char *label) +{ + return msgb_alloc(1024, label); +} + +/*! Combine the mslookup query service, ID and ID type into a domain string. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success, + * NULL on failure. + */ +static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix) +{ + const char *id; + + /* Get id from query */ + switch (query->id.type) { + case OSMO_MSLOOKUP_ID_IMSI: + id = query->id.imsi; + break; + case OSMO_MSLOOKUP_ID_MSISDN: + id = query->id.msisdn; + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type); + return NULL; + } + + return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type), + domain_suffix); +} + +/*! Split up query service, ID and ID type from a domain string into a mslookup query. + * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org" + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we + * remove it in this function. Example: "mdns.osmocom.org" + */ +int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix) +{ + int domain_len = strlen(domain) - strlen(domain_suffix) - 1; + char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN]; + + if (domain_len <= 0 || domain_len >= sizeof(domain_buf)) + return -EINVAL; + + if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0) + return -EINVAL; + + memcpy(domain_buf, domain, domain_len); + domain_buf[domain_len] = '\0'; + return osmo_mslookup_query_init_from_domain_str(query, domain_buf); +} + +/*! Encode a mslookup query into a mDNS packet. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msgb, or NULL on error. + */ +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix) +{ + struct osmo_mdns_msg_request req = {0}; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + + req.id = packet_id; + req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL; + req.domain = domain_from_query(ctx, query, domain_suffix); + if (!req.domain) + goto error; + if (osmo_mdns_msg_request_encode(ctx, msg, &req)) + goto error; + talloc_free(req.domain); + return msg; +error: + msgb_free(msg); + talloc_free(req.domain); + return NULL; +} + +/*! Decode a mDNS request packet into a mslookup query. + * \param[out] packet_id the result must be sent with the same packet_id. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated mslookup query on success, NULL on error. + */ +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix) +{ + struct osmo_mdns_msg_request *req = NULL; + struct osmo_mslookup_query *query = NULL; + + req = osmo_mdns_msg_request_decode(ctx, data, data_len); + if (!req) + return NULL; + + query = talloc_zero(ctx, struct osmo_mslookup_query); + OSMO_ASSERT(query); + if (query_from_domain(query, req->domain, domain_suffix) < 0) + goto error_free; + + *packet_id = req->id; + talloc_free(req); + return query; +error_free: + talloc_free(req); + talloc_free(query); + return NULL; +} + +/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it. + * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str. + * \param[in] rec single record of the abstracted list of mDNS records + * \returns 0 on success, -EINVAL on error. + */ +static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec) +{ + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (rec->length != 4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0); + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (rec->length != 16) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0); + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + return 0; +} + +/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet. + * + * The records in the packet are ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[in] packet_id as received in osmo_mdns_query_decode(). + * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn"). + * \param[in] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msg on success, NULL on error. + */ +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix) +{ + struct osmo_mdns_msg_answer ans = {}; + struct osmo_mdns_record *rec_age = NULL; + struct osmo_mdns_record rec_ip_v4 = {0}; + struct osmo_mdns_record rec_ip_v6 = {0}; + struct osmo_mdns_record *rec_ip_v4_port = NULL; + struct osmo_mdns_record *rec_ip_v6_port = NULL; + struct in_addr rec_ip_v4_in; + struct in6_addr rec_ip_v6_in; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + char buf[256]; + + ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode"); + + /* Prepare answer (ans) */ + ans.domain = domain_from_query(ctx, query, domain_suffix); + if (!ans.domain) + goto error; + ans.id = packet_id; + INIT_LLIST_HEAD(&ans.records); + + /* Record for age */ + rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age); + OSMO_ASSERT(rec_age); + llist_add_tail(&rec_age->list, &ans.records); + + /* Records for IPv4 */ + if (osmo_sockaddr_str_is_set(&result->host_v4)) { + if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in; + rec_ip_v4.length = sizeof(rec_ip_v4_in); + llist_add_tail(&rec_ip_v4.list, &ans.records); + + rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port); + OSMO_ASSERT(rec_ip_v4_port); + llist_add_tail(&rec_ip_v4_port->list, &ans.records); + } + + /* Records for IPv6 */ + if (osmo_sockaddr_str_is_set(&result->host_v6)) { + if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in; + rec_ip_v6.length = sizeof(rec_ip_v6_in); + llist_add_tail(&rec_ip_v6.list, &ans.records); + + rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port); + OSMO_ASSERT(rec_ip_v6_port); + llist_add_tail(&rec_ip_v6_port->list, &ans.records); + } + + if (osmo_mdns_msg_answer_encode(ctx, msg, &ans)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + talloc_free(ctx); + return msg; +error: + msgb_free(msg); + talloc_free(ctx); + return NULL; +} + +static int decode_uint32_t(const char *str, uint32_t *val) +{ + long long int lld; + char *endptr = NULL; + *val = 0; + errno = 0; + lld = strtoll(str, &endptr, 10); + if (errno || !endptr || *endptr) + return -EINVAL; + if (lld < 0 || lld > UINT32_MAX) + return -EINVAL; + *val = lld; + return 0; +} + +static int decode_port(const char *str, uint16_t *port) +{ + uint32_t val; + if (decode_uint32_t(str, &val)) + return -EINVAL; + if (val > 65535) + return -EINVAL; + *port = val; + return 0; +} + +/*! Read expected mDNS records into mslookup result. + * + * The records in the packet must be ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] ans abstracted mDNS answer with a list of resource records. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_record *rec; + char txt_key[64]; + char txt_value[64]; + bool found_age = false; + bool found_ip_v4 = false; + bool found_ip_v6 = false; + struct osmo_sockaddr_str *expect_port_for = NULL; + + *result = (struct osmo_mslookup_result){}; + + result->rc = OSMO_MSLOOKUP_RC_NONE; + + llist_for_each_entry(rec, &ans->records, list) { + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'A' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v4 = true; + expect_port_for = &result->host_v4; + if (sockaddr_str_from_mdns_record(expect_port_for, rec)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'AAAA' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v6) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v6 = true; + expect_port_for = &result->host_v6; + if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_TXT: + if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key), + txt_value, sizeof(txt_value)) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n"); + return -EINVAL; + } + if (strcmp(txt_key, "age") == 0) { + if (found_age) { + LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n"); + return -EINVAL; + } + found_age = true; + if (decode_uint32_t(txt_value, &result->age)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value); + return -EINVAL; + } + } else if (strcmp(txt_key, "port") == 0) { + if (!expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n"); + return -EINVAL; + } + if (decode_port(txt_value, &expect_port_for->port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value); + return -EINVAL; + } + expect_port_for = NULL; + } else { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key); + return -EINVAL; + } + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + } + + /* Check if everything was found */ + if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n"); + return -EINVAL; + } + + result->rc = OSMO_MSLOOKUP_RC_RESULT; + return 0; +} + +/*! Decode a mDNS answer packet into a mslookup result, query and packet_id. + * \param[out] packet_id same ID as sent in the request packet. + * \param[out] query the original query (service, ID, ID type). + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix) +{ + int rc = -EINVAL; + struct osmo_mdns_msg_answer *ans; + ans = osmo_mdns_msg_answer_decode(ctx, data, data_len); + if (!ans) + goto exit_free; + + if (query_from_domain(query, ans->domain, domain_suffix) < 0) + goto exit_free; + + if (osmo_mdns_result_from_answer(result, ans) < 0) + goto exit_free; + + *packet_id = ans->id; + rc = 0; + +exit_free: + talloc_free(ans); + return rc; +} diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c new file mode 100644 index 0000000..da65fef --- /dev/null +++ b/src/mslookup/mdns_msg.c @@ -0,0 +1,261 @@ +/* High level mDNS encoding and decoding functions for whole messages: + * Request message (header, question) + * Answer message (header, resource record 1, ... resource record N)*/ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include + +/*! Encode request message into one mDNS packet, consisting of the header section and one question section. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_rfc_question qst = {0}; + + hdr.id = req->id; + hdr.qdcount = 1; + osmo_mdns_rfc_header_encode(msg, &hdr); + + qst.domain = req->domain; + qst.qtype = req->type; + qst.qclass = OSMO_MDNS_RFC_CLASS_IN; + if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) + return -EINVAL; + + return 0; +} + +/*! Decode request message from a mDNS packet, consisting of the header section and one question section. + * \returns allocated request message on success, NULL on error. + */ +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {0}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_rfc_question* qst = NULL; + struct osmo_mdns_msg_request *ret = NULL; + + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0) + return NULL; + + qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len); + if (!qst) + return NULL; + + ret = talloc_zero(ctx, struct osmo_mdns_msg_request); + ret->id = hdr.id; + ret->domain = talloc_strdup(ret, qst->domain); + ret->type = qst->qtype; + + talloc_free(qst); + return ret; +} + +/*! Initialize the linked list for resource records in a answer message. */ +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans) +{ + *ans = (struct osmo_mdns_msg_answer){}; + INIT_LLIST_HEAD(&ans->records); +} + +/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records. + * + * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of + * "message compression", which would send a question section with the domain before the resource records, and then + * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4). + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_record *ans_record; + + hdr.id = ans->id; + hdr.qr = 1; + hdr.ancount = llist_count(&ans->records); + osmo_mdns_rfc_header_encode(msg, &hdr); + + llist_for_each_entry(ans_record, &ans->records, list) { + struct osmo_mdns_rfc_record rec = {0}; + + rec.domain = ans->domain; + rec.type = ans_record->type; + rec.class = OSMO_MDNS_RFC_CLASS_IN; + rec.ttl = 0; + rec.rdlength = ans_record->length; + rec.rdata = ans_record->data; + + if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) + return -EINVAL; + } + + return 0; +} + +/*! Decode answer message from a mDNS packet. + * + * Answer messages must consist of one header and one or more resource records. An additional question section or + * message compression (RFC 1035 4.1.4) are not supported. +* \returns allocated answer message on success, NULL on error. + */ +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer); + + /* Parse header section */ + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1) + goto error; + ret->id = hdr.id; + data_len -= hdr_len; + data += hdr_len; + + /* Parse resource records */ + INIT_LLIST_HEAD(&ret->records); + while (data_len) { + size_t record_len; + struct osmo_mdns_rfc_record *rec; + struct osmo_mdns_record* ret_record; + + rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len); + if (!rec) + goto error; + + /* Copy domain to ret */ + if (ret->domain) { + if (strcmp(ret->domain, rec->domain) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n", + ret->domain, rec->domain); + goto error; + } + } + else + ret->domain = talloc_strdup(ret, rec->domain); + + /* Add simplified record to ret */ + ret_record = talloc_zero(ret, struct osmo_mdns_record); + ret_record->type = rec->type; + ret_record->length = rec->rdlength; + ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength); + llist_add_tail(&ret_record->list, &ret->records); + + data += record_len; + data_len -= record_len; + talloc_free(rec); + } + + /* Verify record count */ + if (llist_count(&ret->records) != hdr.ancount) { + LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n", + llist_count(&ret->records), hdr.ancount); + goto error; + } + + return ret; +error: + talloc_free(ret); + return NULL; +} + +/*! Get a TXT resource record, which stores a key=value string. + * \returns allocated resource record on success, NULL on error. + */ +static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value) +{ + struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record); + size_t len = strlen(key) + 1 + strlen(value); + + if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1) + return NULL; + + /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */ + ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value); + if (!ret->data) + return NULL; + ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT; + ret->length = len + 1; + return ret; +} + +/*! Get a TXT resource record, which stores a key=value string, but build value from a format string. + * \returns allocated resource record on success, NULL on error. + */ +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...) +{ + va_list ap; + char *value = NULL; + struct osmo_mdns_record *r; + + if (!value_fmt) + return _osmo_mdns_record_txt_encode(ctx, key, ""); + + va_start(ap, value_fmt); + value = talloc_vasprintf(ctx, value_fmt, ap); + if (!value) + return NULL; + va_end(ap); + r = _osmo_mdns_record_txt_encode(ctx, key, value); + talloc_free(value); + return r; +} + +/*! Decode a TXT resource record, which stores a key=value string. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size) +{ + const char *key_value; + const char *key_value_end; + const char *sep; + const char *value; + + if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT) + return -EINVAL; + + key_value = (const char *)rec->data; + key_value_end = key_value + rec->length; + + /* Verify and then skip the redundant string length byte */ + if (*key_value != rec->length - 1) + return -EINVAL; + key_value++; + + if (key_value >= key_value_end) + return -EINVAL; + + /* Find equals sign */ + sep = osmo_strnchr(key_value, key_value_end - key_value, '='); + if (!sep) + return -EINVAL; + + /* Parse key */ + osmo_print_n(key_buf, key_size, key_value, sep - key_value); + + /* Parse value */ + value = sep + 1; + osmo_print_n(value_buf, value_size, value, key_value_end - value); + return 0; +} diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c new file mode 100644 index 0000000..e1fc184 --- /dev/null +++ b/src/mslookup/mdns_rfc.c @@ -0,0 +1,265 @@ +/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records, + * as described in these RFCs: + * - RFC 1035 (Domain names - implementation and specification) + * - RFC 3596 (DNS Extensions to Support IP Version 6) */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +/* + * Encode/decode IEs + */ + +/*! Encode a domain string as qname (RFC 1035 4.1.2). + * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". + * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. + */ +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) +{ + char *domain_dup; + char *domain_iter; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + char *label; + + if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + domain_iter = domain_dup = talloc_strdup(ctx, domain); + while ((label = strsep(&domain_iter, "."))) { + size_t len = strlen(label); + + /* Empty domain, dot at start, two dots in a row, or ending with a dot */ + if (!len) + goto error; + + OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); + } + + talloc_free(domain_dup); + return talloc_strdup(ctx, buf); + +error: + talloc_free(domain_dup); + return NULL; +} + +/*! Decode a domain string from a qname (RFC 1035 4.1.2). + * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) + * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. + * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), + * NULL on error. + */ +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) +{ + const char *next_label, *qname_end = qname + qname_max_len; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; + int i = 0; + + if (qname_max_len < 1) + return NULL; + + while (*qname) { + size_t len = *qname; + next_label = qname + len + 1; + + if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + if (i) { + /* Two dots in a row is not allowed */ + if (buf[i - 1] == '.') + return NULL; + + buf[i] = '.'; + i++; + } + + memcpy(buf + i, qname + 1, len); + i += len; + qname = next_label; + } + buf[i] = '\0'; + + return talloc_strdup(ctx, buf); +} + +/* + * Encode/decode message sections + */ + +/*! Encode header section (RFC 1035 4.1.1). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr) +{ + struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr)); + memcpy(buf, hdr, sizeof(*hdr)); + + osmo_store16be(buf->id, &buf->id); + osmo_store16be(buf->qdcount, &buf->qdcount); + osmo_store16be(buf->ancount, &buf->ancount); + osmo_store16be(buf->nscount, &buf->nscount); + osmo_store16be(buf->arcount, &buf->arcount); +} + +/*! Decode header section (RFC 1035 4.1.1). */ +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr) +{ + if (data_len != sizeof(*hdr)) + return -EINVAL; + + memcpy(hdr, data, data_len); + + hdr->id = osmo_load16be(&hdr->id); + hdr->qdcount = osmo_load16be(&hdr->qdcount); + hdr->ancount = osmo_load16be(&hdr->ancount); + hdr->nscount = osmo_load16be(&hdr->nscount); + hdr->arcount = osmo_load16be(&hdr->arcount); + + return 0; +} + +/*! Encode question section (RFC 1035 4.1.2). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) +{ + char *qname; + size_t qname_len; + uint8_t *qname_buf; + + /* qname */ + qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); + if (!qname) + return -EINVAL; + qname_len = strlen(qname) + 1; + qname_buf = msgb_put(msg, qname_len); + memcpy(qname_buf, qname, qname_len); + talloc_free(qname); + + /* qtype and qclass */ + msgb_put_u16(msg, qst->qtype); + msgb_put_u16(msg, qst->qclass); + + return 0; +} + +/*! Decode question section (RFC 1035 4.1.2). */ +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_question *ret; + size_t qname_len = data_len - 4; + + if (data_len < 6) + return NULL; + + /* qname */ + ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); + if (!ret) + return NULL; + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); + if (!ret->domain) { + talloc_free(ret); + return NULL; + } + + /* qtype and qclass */ + ret->qtype = osmo_load16be(data + qname_len); + ret->qclass = osmo_load16be(data + qname_len + 2); + + return ret; +} + +/* + * Encode/decode resource records + */ + +/*! Encode one resource record (RFC 1035 4.1.3). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) +{ + char *name; + size_t name_len; + uint8_t *buf; + + /* name */ + name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); + if (!name) + return -EINVAL; + name_len = strlen(name) + 1; + buf = msgb_put(msg, name_len); + memcpy(buf, name, name_len); + talloc_free(name); + + /* type, class, ttl, rdlength */ + msgb_put_u16(msg, rec->type); + msgb_put_u16(msg, rec->class); + msgb_put_u32(msg, rec->ttl); + msgb_put_u16(msg, rec->rdlength); + + /* rdata */ + buf = msgb_put(msg, rec->rdlength); + memcpy(buf, rec->rdata, rec->rdlength); + return 0; +} + +/*! Decode one resource record (RFC 1035 4.1.3). */ +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len) +{ + struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); + size_t name_len; + + /* name */ + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); + if (!ret->domain) + goto error; + name_len = strlen(ret->domain) + 2; + if (name_len + 10 > data_len) + goto error; + + /* type, class, ttl, rdlength */ + ret->type = osmo_load16be(data + name_len); + ret->class = osmo_load16be(data + name_len + 2); + ret->ttl = osmo_load32be(data + name_len + 4); + ret->rdlength = osmo_load16be(data + name_len + 8); + if (name_len + 10 + ret->rdlength > data_len) + goto error; + + /* rdata */ + ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength); + if (!ret->rdata) + return NULL; + + *record_len = name_len + 10 + ret->rdlength; + return ret; +error: + talloc_free(ret); + return NULL; +} + diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c new file mode 100644 index 0000000..5291660 --- /dev/null +++ b/src/mslookup/mdns_sock.c @@ -0,0 +1,144 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*! Open socket to send and receive multicast data. + * + * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives + * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever + * sending something, the receive callback will be called with the same data and should discard it. + * + * \param[in] ip multicast IPv4 or IPv6 address. + * \param[in] port port number. + * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd). + * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data). + * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr). + * \returns allocated osmo_mdns_sock, NULL on error. + */ +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr) +{ + struct osmo_mdns_sock *ret; + int sock, rc; + struct addrinfo hints = {0}; + struct ip_mreq multicast_req = {0}; + in_addr_t iface = INADDR_ANY; + char portbuf[10]; + int y = 1; + + snprintf(portbuf, sizeof(portbuf) -1, "%u", port); + ret = talloc_zero(ctx, struct osmo_mdns_sock); + OSMO_ASSERT(ret); + + /* Fill addrinfo */ + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); + rc = getaddrinfo(ip, portbuf, &hints, &ret->ai); + if (rc != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc)); + ret->ai = NULL; + goto error; + } + + /* Open socket */ + sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0); + if (sock == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno)); + goto error; + } + + /* Set multicast options */ + rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, + sizeof(multicast_req.imr_multiaddr)); + multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); + rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by + * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for + * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same + * time need to be resolved with the simple dialplan example that just starts new processes). */ + rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Bind and register osmo_fd callback */ + rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); + goto error; + } + osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); + if (osmo_fd_register(&ret->osmo_fd) != 0) + goto error; + + return ret; +error: + if (ret->ai) + freeaddrinfo(ret->ai); + talloc_free(ret); + return NULL; +} + +/*! Send msgb over mdns_sock and consume msgb. + * \returns 0 on success, -1 on error. + */ +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) +{ + size_t len = msgb_length(msg); + int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr, + mdns_sock->ai->ai_addrlen); + msgb_free(msg); + return (rc == len) ? 0 : -1; +} + +/*! Tear down osmo_mdns_sock. */ +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock) +{ + osmo_fd_close(&mdns_sock->osmo_fd); + freeaddrinfo(mdns_sock->ai); + talloc_free(mdns_sock); +} diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c new file mode 100644 index 0000000..7ba3502 --- /dev/null +++ b/src/mslookup/mslookup_client_mdns.c @@ -0,0 +1,235 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct osmo_mdns_method_state { + /* Parameters passed by _add_method_dns() */ + struct osmo_sockaddr_str bind_addr; + const char *domain_suffix; + + struct osmo_mdns_sock *mc; + + struct osmo_mslookup_client *client; + struct llist_head requests; + uint16_t next_packet_id; +}; + +struct osmo_mdns_method_request { + struct llist_head entry; + uint32_t request_handle; + struct osmo_mslookup_query query; + uint16_t packet_id; +}; + +static int request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state, + struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mdns_method_request *request; + + llist_for_each_entry(request, &state->requests, entry) { + if (strcmp(request->query.service, query->service) != 0) + continue; + if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0) + continue; + + /* Match! */ + *request_handle = request->request_handle; + return 0; + } + return -1; +} + +static int mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + struct osmo_mdns_method_state *state = osmo_fd->data; + struct osmo_mslookup_result result; + struct osmo_mslookup_query query; + uint16_t packet_id; + int n; + uint8_t buffer[1024]; + uint32_t request_handle = 0; + void *ctx = state; + + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + if (n < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n"); + return n; + } + + if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0) + return -EINVAL; + + if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0) + return -EINVAL; + + osmo_mslookup_client_rx_result(state->client, request_handle, &result); + return n; +} + +static void mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query, + uint32_t request_handle) +{ + char buf[256]; + struct osmo_mdns_method_state *state = method->priv; + struct msgb *msg; + struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request); + + *r = (struct osmo_mdns_method_request){ + .request_handle = request_handle, + .query = *query, + .packet_id = state->next_packet_id, + }; + llist_add(&r->entry, &state->requests); + state->next_packet_id++; + + msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix); + if (!msg) { + LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + } + + /* Send over the wire */ + LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service, + osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id)); + if (osmo_mdns_sock_send(state->mc, msg) == -1) + LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\n"); +} + +static void mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle) +{ + struct osmo_mdns_method_state *state = method->priv; + + /* Tear down any state associated with this handle. */ + struct osmo_mdns_method_request *r; + llist_for_each_entry(r, &state->requests, entry) { + if (r->request_handle != request_handle) + continue; + llist_del(&r->entry); + talloc_free(r); + return; + } +} + +static void mdns_method_destruct(struct osmo_mslookup_client_method *method) +{ + struct osmo_mdns_method_state *state = method->priv; + struct osmo_mdns_method_request *e, *n; + if (!state) + return; + + /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will + * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */ + llist_for_each_entry_safe(e, n, &state->requests, entry) { + llist_del(&e->entry); + } + + osmo_mdns_sock_cleanup(state->mc); +} + +/*! Initialize the mDNS lookup method. + * \param[in] client the client to attach the method to. + * \param[in] ip IPv4 or IPv6 address string. + * \param[in] port The port to bind to. + * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All + * servers answer to each query with the same packet ID. Set to -1 to use a random + * initial ID (recommended unless you need deterministic output). This ID is for visually + * distinguishing the packets in packet sniffers, the mslookup client uses not just the + * ID, but all query parameters (service type, ID, ID type), to determine if a reply is + * relevant. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" */ +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix) +{ + struct osmo_mdns_method_state *state; + struct osmo_mslookup_client_method *m; + + m = talloc_zero(client, struct osmo_mslookup_client_method); + OSMO_ASSERT(m); + + state = talloc_zero(m, struct osmo_mdns_method_state); + OSMO_ASSERT(state); + INIT_LLIST_HEAD(&state->requests); + if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n", + ip, port); + goto error_cleanup; + } + + if (initial_packet_id == -1) { + if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n"); + goto error_cleanup; + } + } else + state->next_packet_id = initial_packet_id; + + state->client = client; + state->domain_suffix = domain_suffix; + + state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0); + if (!state->mc) + goto error_cleanup; + + *m = (struct osmo_mslookup_client_method){ + .name = "mDNS", + .priv = state, + .request = mdns_method_request, + .request_cleanup = mdns_method_request_cleanup, + .destruct = mdns_method_destruct, + }; + + osmo_mslookup_client_method_add(client, m); + return m; + +error_cleanup: + talloc_free(m); + return NULL; +} + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return &state->bind_addr; +} + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return state->domain_suffix; +} diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index 71602a3..ebf2add 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -16,11 +16,15 @@ $(NULL) EXTRA_DIST = \ + mdns_test.err \ + mslookup_client_mdns_test.err \ mslookup_client_test.err \ mslookup_test.err \ $(NULL) check_PROGRAMS = \ + mdns_test \ + mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -41,6 +45,22 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +mdns_test_SOURCES = \ + mdns_test.c \ + $(NULL) +mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c new file mode 100644 index 0000000..8a60e85 --- /dev/null +++ b/tests/mslookup/mdns_test.c @@ -0,0 +1,602 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct qname_enc_dec_test { + const char *domain; + const char *qname; + size_t qname_max_len; /* default: strlen(qname) + 1 */ +}; + +static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { + { + /* OK: typical mslookup domain */ + .domain = "hlr.1234567.imsi", + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: double dot */ + .domain = "hlr..imsi", + .qname = NULL, + }, + { + /* Wrong format: double dot */ + .domain = "hlr", + .qname = "\x03hlr\0\x03imsi", + }, + { + /* Wrong format: dot at end */ + .domain = "hlr.", + .qname = NULL, + }, + { + /* Wrong format: dot at start */ + .domain = ".hlr", + .qname = NULL, + }, + { + /* Wrong format: empty */ + .domain = "", + .qname = NULL, + }, + { + /* OK: maximum length */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345" + , + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\x05" "12345" + }, + { + /* Error: too long domain */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345toolong" + , + .qname = NULL, + }, + { + /* Error: too long qname */ + .domain = NULL, + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: token length at end of qname */ + .domain = NULL, + .qname = "\x03hlr\x03", + }, + { + /* Error: overflow in label length */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + .qname_max_len = 17, + }, +}; + +void test_enc_dec_rfc_qname(void *ctx) +{ + char quote_buf[300]; + int i; + + fprintf(stderr, "-- %s --\n", __func__); + + for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { + const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; + char *res; + + if (t->domain) { + fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + res = osmo_mdns_rfc_qname_encode(ctx, t->domain); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + + if (t->qname) { + size_t qname_max_len = t->qname_max_len; + if (qname_max_len) + fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); + else + qname_max_len = strlen(t->qname) + 1; + + fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + } +} + +#define PRINT_HDR(hdr, name) \ + fprintf(stderr, "header %s:\n" \ + ".id = %i\n" \ + ".qr = %i\n" \ + ".opcode = %x\n" \ + ".aa = %i\n" \ + ".tc = %i\n" \ + ".rd = %i\n" \ + ".ra = %i\n" \ + ".z = %x\n" \ + ".rcode = %x\n" \ + ".qdcount = %u\n" \ + ".ancount = %u\n" \ + ".nscount = %u\n" \ + ".arcount = %u\n", \ + name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \ + hdr.ancount, hdr.nscount, hdr.arcount) + +static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = { + { + /* Typical use case for mslookup */ + .id = 1337, + .qdcount = 1, + }, + { + /* Fill out everything */ + .id = 42, + .qr = 1, + .opcode = 0x02, + .aa = 1, + .tc = 1, + .rd = 1, + .ra = 1, + .z = 0x02, + .rcode = 0x03, + .qdcount = 1234, + .ancount = 1111, + .nscount = 2222, + .arcount = 3333, + }, +}; + +void test_enc_dec_rfc_header() +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i]; + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_HDR(in, "in"); + osmo_mdns_rfc_header_encode(msg, &in); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0); + PRINT_HDR(out, "out"); + + fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in))); + fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out))); + assert(memcmp(&in, &out, sizeof(in)) == 0); + + fprintf(stderr, "=> OK\n\n"); + msgb_free(msg); + } +} + +void test_enc_dec_rfc_header_einval() +{ + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + fprintf(stderr, "-- %s --\n", __func__); + + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL); + fprintf(stderr, "=> OK\n\n"); + + msgb_free(msg); +} + +#define PRINT_QST(qst, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".qtype = %i\n" \ + ".qclass = %i\n", \ + name, (qst)->domain, (qst)->qtype, (qst)->qclass) + +static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL, + .qclass = OSMO_MDNS_RFC_CLASS_IN, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, +}; + +void test_enc_dec_rfc_question(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i]; + struct osmo_mdns_rfc_question *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_QST(&in, "in"); + assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); + assert(out); + PRINT_QST(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.qtype != out->qtype) + fprintf(stderr, "=> ERROR: qtype does not match\n"); + else if (in.qclass != out->qclass) + fprintf(stderr, "=> ERROR: qclass does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +void test_enc_dec_rfc_question_null(void *ctx) +{ + uint8_t data[5] = {0}; + + fprintf(stderr, "-- %s --\n", __func__); + assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL); + fprintf(stderr, "=> OK\n\n"); +} + +#define PRINT_REC(rec, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".type = %i\n" \ + ".class = %i\n" \ + ".ttl = %i\n" \ + ".rdlength = %i\n" \ + ".rdata = %s\n", \ + name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \ + osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength)) + +static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .type = OSMO_MDNS_RFC_RECORD_TYPE_A, + .class = OSMO_MDNS_RFC_CLASS_IN, + .ttl = 1234, + .rdlength = 9, + .rdata = (uint8_t *)"10.42.2.1", + }, +}; + +void test_enc_dec_rfc_record(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i]; + struct osmo_mdns_rfc_record *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + size_t record_len; + + PRINT_REC(&in, "in"); + assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); + fprintf(stderr, "record_len: %lu\n", record_len); + assert(out); + PRINT_REC(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.type != out->type) + fprintf(stderr, "=> ERROR: type does not match\n"); + else if (in.class != out->class) + fprintf(stderr, "=> ERROR: class does not match\n"); + else if (in.ttl != out->ttl) + fprintf(stderr, "=> ERROR: ttl does not match\n"); + else if (in.rdlength != out->rdlength) + fprintf(stderr, "=> ERROR: rdlength does not match\n"); + else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0) + fprintf(stderr, "=> ERROR: rdata does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +static uint8_t ip_v4_n[] = {23, 42, 47, 11}; +static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, + 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}; + + +enum test_records { + RECORD_NONE, + RECORD_A, + RECORD_AAAA, + RECORD_TXT_AGE, + RECORD_TXT_PORT_444, + RECORD_TXT_PORT_666, + RECORD_TXT_INVALID_KEY, + RECORD_TXT_INVALID_NO_KEY_VALUE, + RECORD_INVALID, +}; +struct result_from_answer_test { + const char *desc; + const enum test_records records[5]; + bool error; + const struct osmo_mslookup_result res; +}; + +static void test_result_from_answer(void *ctx) +{ + void *print_ctx = talloc_named_const(ctx, 0, __func__); + struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"}; + struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666, + .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"}; + struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4}; + struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v6 = test_host_v6}; + struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4, .host_v6 = test_host_v6}; + struct result_from_answer_test result_from_answer_data[] = { + { + .desc = "IPv4", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444}, + .res = test_result_v4 + }, + { + .desc = "IPv6", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v6 + }, + { + .desc = "IPv4 + IPv6", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v4_v6 + }, + { + .desc = "A twice", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A}, + .error = true + }, + { + .desc = "AAAA twice", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA}, + .error = true + }, + { + .desc = "invalid TXT: no key/value pair", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE}, + .error = true + }, + { + .desc = "age twice", + .records = {RECORD_TXT_AGE, RECORD_TXT_AGE}, + .error = true + }, + { + .desc = "port as first record", + .records = {RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "port without previous ip record", + .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "invalid TXT: invalid key", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY}, + .error = true + }, + { + .desc = "unexpected record type", + .records = {RECORD_TXT_AGE, RECORD_INVALID}, + .error = true + }, + { + .desc = "missing record: age", + .records = {RECORD_A, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "missing record: port for ipv4", + .records = {RECORD_TXT_AGE, RECORD_A}, + .error = true + }, + { + .desc = "missing record: port for ipv4 #2", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A}, + .error = true + }, + }; + int i = 0; + int j = 0; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) { + struct result_from_answer_test *t = &result_from_answer_data[i]; + struct osmo_mdns_msg_answer ans = {0}; + struct osmo_mslookup_result res = {0}; + void *ctx_test = talloc_named_const(ctx, 0, t->desc); + bool is_error; + + fprintf(stderr, "---\n"); + fprintf(stderr, "test: %s\n", t->desc); + fprintf(stderr, "error: %s\n", t->error ? "true" : "false"); + fprintf(stderr, "records:\n"); + /* Build records list */ + INIT_LLIST_HEAD(&ans.records); + for (j = 0; j < ARRAY_SIZE(t->records); j++) { + struct osmo_mdns_record *rec = NULL; + + switch (t->records[j]) { + case RECORD_NONE: + break; + case RECORD_A: + fprintf(stderr, "- A 42.42.42.42\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec->data = ip_v4_n; + rec->length = sizeof(ip_v4_n); + break; + case RECORD_AAAA: + fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec->data = ip_v6_n; + rec->length = sizeof(ip_v6_n); + break; + case RECORD_TXT_AGE: + fprintf(stderr, "- TXT age=3\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3"); + break; + case RECORD_TXT_PORT_444: + fprintf(stderr, "- TXT port=444\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444"); + break; + case RECORD_TXT_PORT_666: + fprintf(stderr, "- TXT port=666\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666"); + break; + case RECORD_TXT_INVALID_KEY: + fprintf(stderr, "- TXT hello=world\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world"); + break; + case RECORD_TXT_INVALID_NO_KEY_VALUE: + fprintf(stderr, "- TXT 12345\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45"); + rec->data[3] = '3'; + break; + case RECORD_INVALID: + fprintf(stderr, "- (invalid)\n"); + rec = talloc_zero(ctx, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN; + break; + } + + if (rec) + llist_add_tail(&rec->list, &ans.records); + } + + /* Verify output */ + is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0); + if (t->error != is_error) { + fprintf(stderr, "got %s\n", is_error ? "error" : "no error"); + OSMO_ASSERT(false); + } + if (!t->error) { + fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res)); + fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res)); + OSMO_ASSERT(t->res.rc == res.rc); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4)); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6)); + OSMO_ASSERT(t->res.age == res.age); + OSMO_ASSERT(t->res.last == res.last); + } + + talloc_free(ctx_test); + fprintf(stderr, "=> OK\n"); + } +} + +int main() +{ + void *ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + + test_enc_dec_rfc_qname(ctx); + test_enc_dec_rfc_header(); + test_enc_dec_rfc_header_einval(); + test_enc_dec_rfc_question(ctx); + test_enc_dec_rfc_question_null(ctx); + test_enc_dec_rfc_record(ctx); + + test_result_from_answer(ctx); + + return 0; +} diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err new file mode 100644 index 0000000..51e5afe --- /dev/null +++ b/tests/mslookup/mdns_test.err @@ -0,0 +1,336 @@ +-- test_enc_dec_rfc_qname -- +domain: "hlr.1234567.imsi" +exp: "\3hlr\a1234567\4imsi" +res: "\3hlr\a1234567\4imsi" +=> OK + +qname: "\3hlr\a1234567\4imsi" +exp: "hlr.1234567.imsi" +res: "hlr.1234567.imsi" +=> OK + +domain: "hlr..imsi" +exp: NULL +res: NULL +=> OK + +domain: "hlr" +exp: "\3hlr" +res: "\3hlr" +=> OK + +qname: "\3hlr" +exp: "hlr" +res: "hlr" +=> OK + +domain: "hlr." +exp: NULL +res: NULL +=> OK + +domain: ".hlr" +exp: NULL +res: NULL +=> OK + +domain: "" +exp: NULL +res: NULL +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" +exp: NULL +res: NULL +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\a1234567\5imsi" +exp: NULL +res: NULL +=> OK + +qname: "\2hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\3" +exp: NULL +res: NULL +=> OK + +qname_max_len: 17 +qname: "\3hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +-- test_enc_dec_rfc_header -- +header in: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +encoded: 05 39 00 00 00 01 00 00 00 00 00 00 +header out: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +=> OK + +header in: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 +header out: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +=> OK + +-- test_enc_dec_rfc_header_einval -- +=> OK + +-- test_enc_dec_rfc_question -- +question in: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 +question out: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +=> OK + +-- test_enc_dec_rfc_question_null -- +=> OK + +-- test_enc_dec_rfc_record -- +question in: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 +record_len: 37 +question out: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +=> OK + +-- test_result_from_answer -- +--- +test: IPv4 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +=> OK +--- +test: IPv6 +error: false +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: IPv4 + IPv6 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: A twice +error: true +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- A 42.42.42.42 +DLGLOBAL ERROR 'A' record found twice in mDNS answer +=> OK +--- +test: AAAA twice +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer +=> OK +--- +test: invalid TXT: no key/value pair +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT 12345 +DLGLOBAL ERROR failed to decode txt record +=> OK +--- +test: age twice +error: true +records: +- TXT age=3 +- TXT age=3 +DLGLOBAL ERROR duplicate 'TXT' record for 'age' +=> OK +--- +test: port as first record +error: true +records: +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: port without previous ip record +error: true +records: +- TXT age=3 +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: invalid TXT: invalid key +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT hello=world +DLGLOBAL ERROR unexpected key 'hello' in TXT record +=> OK +--- +test: unexpected record type +error: true +records: +- TXT age=3 +- (invalid) +DLGLOBAL ERROR unexpected record type +=> OK +--- +test: missing record: age +error: true +records: +- A 42.42.42.42 +- TXT port=444 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 +error: true +records: +- TXT age=3 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 #2 +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c new file mode 100644 index 0000000..6091e3c --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -0,0 +1,220 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void *ctx = NULL; + +#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4 +#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT +#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org" + +/* + * Test server (emulates the mDNS server in OsmoHLR) and client + */ +struct osmo_mdns_sock *server_mc; + + +static void server_reply(struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mslookup_result result = {0}; + struct msgb *msg; + + result.rc = OSMO_MSLOOKUP_RC_RESULT; + result.age = 3; + osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444); + osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666); + + msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(msg); + OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 0); +} + +static int server_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + int n; + uint8_t buffer[1024]; + uint16_t packet_id; + struct osmo_mslookup_query *query; + + fprintf(stderr, "%s\n", __func__); + + /* Parse the message and print it */ + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + OSMO_ASSERT(n >= 0); + + query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX); + if (!query) + return -1; /* server receiving own answer is expected */ + + fprintf(stderr, "received request\n"); + server_reply(query, packet_id); + talloc_free(query); + return n; +} + +static void server_init() +{ + fprintf(stderr, "%s\n", __func__); + server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0); + OSMO_ASSERT(server_mc); +} + +static void server_stop() +{ + fprintf(stderr, "%s\n", __func__); + OSMO_ASSERT(server_mc); + osmo_mdns_sock_cleanup(server_mc); + server_mc = NULL; +} + +struct osmo_mslookup_client* client; +struct osmo_mslookup_client_method* client_method; + +static void client_init() +{ + fprintf(stderr, "%s\n", __func__); + client = osmo_mslookup_client_new(ctx); + OSMO_ASSERT(client); + client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(client_method); +} + +static void client_recv(struct osmo_mslookup_client *client, uint32_t request_handle, + const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result) +{ + char buf[256]; + fprintf(stderr, "%s\n", __func__); + fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + + osmo_mslookup_client_request_cancel(client, request_handle); +} + +static void client_query() +{ + struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI, + .imsi = "123456789012345"}; + const struct osmo_mslookup_query query = { + .service = "gsup.hlr", + .id = id, + }; + struct osmo_mslookup_query_handling handling = { + .result_timeout_milliseconds = 2000, + .result_cb = client_recv, + }; + + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_request(client, &query, &handling); +} + +static void client_stop() +{ + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_free(client); + client = NULL; +} +const struct timeval fake_time_start_time = { 0, 0 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +static void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} +static void test_server_client() +{ + fprintf(stderr, "-- %s --\n", __func__); + server_init(); + client_init(); + client_query(); + + /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and + * port, the client will also receive its own question. The client will dismiss its own question, as it is just + * looking for answers. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback + * (client_recv()) just yet, because it is waiting for the best result within two seconds. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Time flies by, client_recv() gets called. */ + fake_time_passes(5, 0); + + server_stop(); + client_stop(); +} + +/* + * Run all tests + */ +int main() +{ + talloc_enable_null_tracking(); + ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); + + fake_time_start(); + + test_server_client(); + + log_fini(); + + OSMO_ASSERT(talloc_total_blocks(ctx) == 1); + talloc_free(ctx); + OSMO_ASSERT(talloc_total_blocks(NULL) == 1); + talloc_disable_null_tracking(); + + return 0; +} diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err new file mode 100644 index 0000000..b4ea269 --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.err @@ -0,0 +1,14 @@ +Total time passed: 0.000000 s +-- test_server_client -- +server_init +client_init +client_query +sending mDNS query: gsup.hlr.123456789012345.imsi +server_recv +received request +server_recv +client_recv +client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +Total time passed: 5.000000 s +server_stop +client_stop diff --git a/tests/testsuite.at b/tests/testsuite.at index 39df7aa..827e9f8 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -40,6 +40,12 @@ AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([mdns]) +AT_KEYWORDS([mdns]) +cat $abs_srcdir/mslookup/mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr]) +AT_CLEANUP + AT_SETUP([mslookup]) AT_KEYWORDS([mslookup]) cat $abs_srcdir/mslookup/mslookup_test.err > experr @@ -51,3 +57,9 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP + +AT_SETUP([mslookup_client_mdns]) +AT_KEYWORDS([mslookup_client_mdns]) +cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:07:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:07:41 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... add osmo-mslookup-client program Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 957 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index eec364a..0965935 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ src/osmo-hlr-db-tool src/osmo-euse-demo src/gsupclient/gsup-test-client +src/mslookup/osmo-mslookup-client tests/atconfig tests/testsuite diff --git a/configure.ac b/configure.ac index 57aecba..59261e8 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/dgsm/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3439c97..cfd0b15 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1,4 @@ -SUBDIRS = systemd +SUBDIRS = \ + systemd \ + dgsm \ + $(NULL) diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am new file mode 100644 index 0000000..c759302 --- /dev/null +++ b/contrib/dgsm/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + osmo-mslookup-pipe.py \ + osmo-mslookup-socket.py \ + $(NULL) diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py new file mode 100755 index 0000000..b18bf5f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-pipe.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import subprocess +import json + +def query_mslookup(query_str): + result = {'result': 'not-found'} + proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str), + stdout=subprocess.PIPE) + for line in iter(proc.stdout.readline,''): + if not line: + break + response = json.loads(line) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup(query_str)) diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py new file mode 100755 index 0000000..a26ad9f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-socket.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import socket +import time + +MSLOOKUP_SOCKET_PATH = '/tmp/mslookup' + +def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH): + mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) + mslookup_socket.setblocking(True) + mslookup_socket.connect(socket_path) + result = {'result': 'not-found'} + column_names = mslookup_socket.recv(1024).decode('ascii') + if not column_names: + return result + column_names = column_names.split('\t') + mslookup_socket.sendall(query_str.encode('ascii')) + while True: + csv = mslookup_socket.recv(1024).decode('ascii') + if not csv: + break + response = dict(zip(column_names, csv.split('\t'))) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + print( + '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n') + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup_socket(query_str)) diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 07fb6f4..a720c40 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -26,3 +26,12 @@ $(LIBOSMOGSM_LIBS) \ $(TALLOC_LIBS) \ $(NULL) + +bin_PROGRAMS = osmo-mslookup-client +osmo_mslookup_client_SOURCES = osmo-mslookup-client.c +osmo_mslookup_client_LDADD = \ + libosmo-mslookup.la \ + $(LIBOSMOCORE_LIBS) \ + $(TALLOC_LIBS) \ + $(NULL) +osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c new file mode 100644 index 0000000..1c0efe9 --- /dev/null +++ b/src/mslookup/osmo-mslookup-client.c @@ -0,0 +1,879 @@ +/*! \file osmo-mslookup-client.c + * Distributed GSM: find the location of subscribers, for example by multicast DNS, + * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names). + */ +/* + * (C) 2019 by sysmocom s.f.m.c. GmbH + * (C) 2019 by Neels Hofmeyr + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port" + +static void print_version(void) +{ + printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION); + printf("\n" + "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n" + "Copyright (C) 2019 by Neels Hofmeyr \n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + "\n"); +} + +static void print_help() +{ + print_version(); + printf( +"Standalone mslookup client for Distributed GSM\n" +"\n" +"Receiving mslookup results means listening for responses on a socket. Often,\n" +"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n" +"to read responses, because that interferes with the main program (e.g.\n" +"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n" +"that interferes with osmo_select_main(), or an smpp.py uses\n" +"smpplib.client.listen() as main loop, etc.).\n" +"\n" +"This program provides a trivial solution, by outsourcing the mslookup main loop\n" +"to a separate process. Communication is done via cmdline arg and stdout pipe or\n" +"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n" +"\n" +"This can be done one-shot, i.e. exit as soon as the response has been\n" +"determined, or in daemon form, i.e. continuously listen for requests and return\n" +"responses.\n" +"\n" +"About running a local daemon: it is unintuitive to connect to a socket to solve\n" +"a problem of reading from a socket -- it seems like just more of the same\n" +"problem. The reasons why the daemon is in fact useful are:\n" +"- The osmo-mslookup-client daemon will return only those results matching\n" +" requests issued on that socket connection.\n" +"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n" +" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n" +" to asynchronously receive responses from remote servers.\n" +"- Only one long-lived multicast socket needs to be opened instead of a new\n" +" socket for each request.\n" +"\n" +"Output is in CSV or json, see --format. The default is tab-separated CSV\n" +"with these columns:\n" +CSV_HEADERS "\n" +"\n" +"One-shot operation example:\n" +"$ osmo-mslookup-client 1000- at sip.voice.12345.msisdn -f json\n" +"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n" +"$\n" +"\n" +"Daemon operation example:\n" +"$ osmo-mslookup-client -s /tmp/mslookup -d\n" +"(and a client program then connects to /tmp/mslookup, find an implementation\n" +"example below)\n" +"\n" +"Integrating with calling programs can be done by:\n" +"- call osmo-mslookup-client with the query string as argument.\n" +" It will open a multicast DNS socket, send out a query and wait for the\n" +" matching response. It will print the result on stdout and exit.\n" +" This method launches a new process for every mslookup query,\n" +" and creates a short-lived multicast listener for each invocation.\n" +" This is fine for low activity, but does not scale well.\n" +"\n" +"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n" +" Individual queries can be sent by connecting to that unix domain socket,\n" +" blockingly reading the response when it arrives and disconnecting.\n" +" This way only one process keeps one multicast listener open.\n" +" Callers can connect to this socket without spawning processes.\n" +" This is recommended for scale.\n" +"\n" +"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n" +"\n" +"\n" +"Options:\n" +"\n" +"[[delay-][timeout]@]service.number.id\n" +" A service query string with optional individual timeout.\n" +" The same format is also used on a daemon socket, if any.\n" +" The timeout consists of the min-delay and the timeout numbers,\n" +" corresponding to the --min-delay and --timeout options, in milliseconds.\n" +" These options apply if a query string lacks own numbers.\n" +" Examples:\n" +" gsup.hlr.1234567.imsi Use cmdline timeout settings\n" +" 5000 at gsup.hlr.1234567.imsi Return N results for 5 seconds\n" +" 1000-5000 at sip.voice.123.msisdn Same, but silent for first second\n" +" 10000- at smpp.sms.567.msisdn Return 1 result after 10 seconds\n" +"\n" +"--format -f csv (default)\n" +" Format result lines in CSV format.\n" +"--no-csv-headers -H\n" +" If the format is 'csv', by default, the first output line prints the\n" +" CSV headers used for CSV output format. This option disables these CSV\n" +" headers.\n" +"\n" +"--format -f json\n" +" Format result lines in json instead of semicolon separated, like:\n" +" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n" +"\n" +"--daemon -d\n" +" Keep running after a request has been serviced\n" +"\n" +"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n" +"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n" +" Set multicast IP address / port to send mDNS requests and listen for\n" +" mDNS reponses\n" +"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n" +" Append this suffix to each mDNS query's domain to avoid colliding with the\n" +" top-level domains administrated by IANA.\n" +"\n" +"--min-delay -t 1000 (in milliseconds)\n" +" Set minimum delay to wait before returning any results.\n" +" When this timeout has elapsed, the best current result is returned,\n" +" if any is available.\n" +" Responses arriving after the min-delay has elapsed which have a younger\n" +" age than previous results are returned immediately.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--timeout -T 1000 (in milliseconds)\n" +" Set timeout after which to stop listening for responses.\n" +" If this is smaller than -t, the value from -t will be used for -T as well.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--socket -s /path/to/unix-domain-socket\n" +" Listen to requests from and write responses to a UNIX domain socket.\n" +"\n" +"--send -S \n" +" Do not query, but send an mslookup result. This is useful only for\n" +" testing. Examples:\n" +" --send foo.123.msisdn 300 23.42.17.11 1234\n" +" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n" +" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n" +"\n" +"--quiet -q\n" +" Do not print errors to stderr, do not log to stderr.\n" +"\n" +"--help -h\n" +" This help\n" +); +} + +enum result_format { + FORMAT_CSV = 0, + FORMAT_JSON, +}; + +static struct { + bool daemon; + struct osmo_sockaddr_str mdns_addr; + uint32_t min_delay; + uint32_t timeout; + const char *socket_path; + const char *format_str; + const char *mdns_domain_suffix; + bool csv_headers; + bool send; + bool quiet; +} cmdline_opts = { + .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT }, + .min_delay = 1000, + .timeout = 1000, + .csv_headers = true, + .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT, +}; + +#define print_error(fmt, args...) do { \ + if (!cmdline_opts.quiet) \ + fprintf(stderr, fmt, ##args); \ + } while (0) + +char g_buf[1024]; + +long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc) +{ + long long int val; + char *endptr; + if (rc) + *rc = -1; + if (!arg) + return -1; + errno = 0; + val = strtoll(arg, &endptr, 10); + if (errno || val < minval || val > maxval || *endptr) + return -1; + if (rc) + *rc = 0; + return val; +} + +int cb_doing_nothing(struct osmo_fd *fd, unsigned int what) +{ + return 0; +} + +/* --send: Just send a response, for manual testing. */ +int do_send(int argc, char ** argv) +{ + /* parse args */ +#define ARG(NR) ((argc > NR)? argv[NR] : NULL) + const char *query_str = ARG(0); + const char *age_str = ARG(1); + const char *ip_strs[2][2] = { + { ARG(2), ARG(3) }, + { ARG(4), ARG(5) }, + }; + struct osmo_mslookup_query q = {}; + struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT }; + int i; + int rc; + void *ctx = talloc_named_const(NULL, 0, __func__); + struct osmo_mdns_sock *sock; + + if (!query_str) { + print_error("--send needs a query string like foo.123456.imsi\n"); + return 1; + } + if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) { + print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n", + query_str); + return 1; + } + + if (!age_str) { + print_error("--send needs an age\n"); + return 1; + } + r.age = parse_int(0, UINT32_MAX, age_str, &rc); + if (rc) { + print_error("invalid age\n"); + return 1; + } + + for (i = 0; i < 2; i++) { + struct osmo_sockaddr_str addr; + uint16_t port; + if (!ip_strs[i][0]) + continue; + port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc); + if (rc) { + print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL"); + return 1; + } + if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) { + print_error("invalid IP addr: %s\n", ip_strs[i][0]); + return 1; + } + if (addr.af == AF_INET) + r.host_v4 = addr; + else + r.host_v6 = addr; + } + + printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr), + osmo_mslookup_result_name_c(ctx, &q, &r)); + + rc = 1; + sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + cb_doing_nothing, NULL, 0); + if (!sock) { + print_error("unable to open mDNS socket\n"); + goto exit_cleanup; + } + + struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); + if (!msg) { + print_error("unable to encode mDNS response\n"); + goto exit_cleanup; + } + + if (osmo_mdns_sock_send(sock, msg)) { + print_error("unable to send mDNS message\n"); + goto exit_cleanup; + } + + rc = 0; +exit_cleanup: + osmo_mdns_sock_cleanup(sock); + talloc_free(ctx); + return rc; +} + +static struct { + void *ctx; + unsigned int requests_handled; + struct osmo_fd socket_ofd; + struct osmo_mslookup_client *mslookup_client; + struct llist_head queries; + struct llist_head socket_clients; + enum result_format format; +} globals = { + .queries = LLIST_HEAD_INIT(globals.queries), + .socket_clients = LLIST_HEAD_INIT(globals.socket_clients), +}; + +typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r); + +void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "%s", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t"); + else { + OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last"); + OSMO_STRBUF_PRINTF(sb, "\t%u", r->age); + switch (r->rc) { + case OSMO_MSLOOKUP_RC_RESULT: + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + break; + default: + OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t"); + break; + } + } +} + +void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\""); + else { + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false"); + OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age); + if (r->rc == OSMO_MSLOOKUP_RC_RESULT) { + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port); + } + } + OSMO_STRBUF_PRINTF(sb, "}"); +} + +formatter_t formatters[] = { + [FORMAT_CSV] = formatter_csv, + [FORMAT_JSON] = formatter_json, +}; + +void respond_str_stdout(const char *str) { + fprintf(stdout, "%s\n", str); + fflush(stdout); +} + +void start_query_str(const char *query_str); +void start_query_strs(char **query_strs, size_t query_strs_len); + +struct socket_client { + struct llist_head entry; + struct osmo_fd ofd; + char query_str[1024]; +}; + +static void socket_client_close(struct socket_client *c) +{ + struct osmo_fd *ofd = &c->ofd; + + close(ofd->fd); + ofd->fd = -1; + osmo_fd_unregister(ofd); + + llist_del(&c->entry); + talloc_free(c); +} + +void socket_client_respond_result(struct socket_client *c, const char *response) +{ + write(c->ofd.fd, response, strlen(response)); +} + +static int socket_read_cb(struct osmo_fd *ofd) +{ + struct socket_client *c = ofd->data; + int rc; + char rxbuf[1024]; + char *query_with_timeout; + char *query_str; + char *at; + + rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0); + if (rc == 0) + goto close; + + if (rc < 0) { + if (errno == EAGAIN) + return 0; + goto close; + } + + if (rc >= sizeof(c->query_str)) + goto close; + + rxbuf[rc] = '\0'; + query_with_timeout = strtok(rxbuf, "\r\n"); + at = strchr(query_with_timeout, '@'); + query_str = at ? at + 1 : query_with_timeout; + + if (c->query_str[0]) { + print_error("ERROR: Only one query per client connect is allowed;" + " received '%s' and '%s' on the same connection\n", + c->query_str, query_str); + formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL); + socket_client_respond_result(c, g_buf); + return 0; + } + + OSMO_STRLCPY_ARRAY(c->query_str, query_str); + start_query_str(query_with_timeout); + printf("query: %s\n", query_with_timeout); + return rc; + +close: + socket_client_close(c); + return -1; +} + +static int socket_cb(struct osmo_fd *ofd, unsigned int flags) +{ + int rc = 0; + + if (flags & BSC_FD_READ) + rc = socket_read_cb(ofd); + if (rc < 0) + return rc; + + return rc; +} + +int socket_accept(struct osmo_fd *ofd, unsigned int flags) +{ + struct socket_client *c; + struct sockaddr_un un_addr; + socklen_t len; + int rc; + + len = sizeof(un_addr); + rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len); + if (rc < 0) { + print_error("Failed to accept a new connection\n"); + return -1; + } + + c = talloc_zero(globals.ctx, struct socket_client); + OSMO_ASSERT(c); + c->ofd.fd = rc; + c->ofd.when = BSC_FD_READ; + c->ofd.cb = socket_cb; + c->ofd.data = c; + + if (osmo_fd_register(&c->ofd) != 0) { + print_error("Failed to register new connection fd\n"); + close(c->ofd.fd); + c->ofd.fd = -1; + talloc_free(c); + return -1; + } + + llist_add(&c->entry, &globals.socket_clients); + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); + + return 0; +} + +int socket_init(const char *sock_path) +{ + struct osmo_fd *ofd = &globals.socket_ofd; + int rc; + + ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND); + if (ofd->fd < 0) { + print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno)); + return -1; + } + + ofd->when = BSC_FD_READ; + ofd->cb = socket_accept; + + rc = osmo_fd_register(ofd); + if (rc < 0) { + print_error("Could not register listen fd: %d\n", rc); + close(ofd->fd); + return rc; + } + return 0; +} + +void socket_close() +{ + struct socket_client *c, *n; + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) + socket_client_close(c); + if (osmo_fd_is_registered(&globals.socket_ofd)) { + close(globals.socket_ofd.fd); + globals.socket_ofd.fd = -1; + osmo_fd_unregister(&globals.socket_ofd); + } +} + +struct query { + struct llist_head entry; + + char query_str[128]; + struct osmo_mslookup_query query; + uint32_t handle; +}; + +void respond_result(const char *query_str, const struct osmo_mslookup_result *r) +{ + struct socket_client *c, *n; + formatters[globals.format](g_buf, sizeof(g_buf), query_str, r); + respond_str_stdout(g_buf); + + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) { + if (!strcmp(query_str, c->query_str)) { + socket_client_respond_result(c, g_buf); + if (r->last) + socket_client_close(c); + } + } + if (r->last) + globals.requests_handled++; +} + +void respond_err(const char *query_str) +{ + respond_result(query_str, NULL); +} + +struct query *query_by_handle(uint32_t request_handle) +{ + struct query *q; + llist_for_each_entry(q, &globals.queries, entry) { + if (request_handle == q->handle) + return q; + } + return NULL; +} + +void mslookup_result_cb(struct osmo_mslookup_client *client, + uint32_t request_handle, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + struct query *q = query_by_handle(request_handle); + if (!q) + return; + respond_result(q->query_str, result); + if (result->last) { + llist_del(&q->entry); + talloc_free(q); + } +} + +void start_query_str(const char *query_str) +{ + struct query *q; + const char *domain_str = query_str; + char *at; + struct osmo_mslookup_query_handling h = { + .min_wait_milliseconds = cmdline_opts.min_delay, + .result_timeout_milliseconds = cmdline_opts.timeout, + .result_cb = mslookup_result_cb, + }; + + at = strchr(query_str, '@'); + if (at) { + int rc; + char timeouts[16]; + char *dash; + char *timeout; + + domain_str = at + 1; + + h.min_wait_milliseconds = h.result_timeout_milliseconds = 0; + + if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) { + print_error("ERROR: timeouts part too long in query string\n"); + respond_err(domain_str); + return; + } + + dash = strchr(timeouts, '-'); + if (dash) { + char min_delay[16]; + osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts); + h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc); + if (rc) { + print_error("ERROR: invalid min-delay number: %s\n", min_delay); + respond_err(domain_str); + return; + } + timeout = dash + 1; + } else { + timeout = timeouts; + } + if (*timeout) { + h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc); + if (rc) { + print_error("ERROR: invalid timeout number: %s\n", timeout); + respond_err(domain_str); + return; + } + } + } + + if (strlen(domain_str) >= sizeof(q->query_str)) { + print_error("ERROR: query string is too long: '%s'\n", domain_str); + respond_err(domain_str); + return; + } + + q = talloc_zero(globals.ctx, struct query); + OSMO_ASSERT(q); + OSMO_STRLCPY_ARRAY(q->query_str, domain_str); + + if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) { + print_error("ERROR: cannot parse query string: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h); + if (!q->handle) { + print_error("ERROR: cannot send query: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + llist_add(&q->entry, &globals.queries); +} + +void start_query_strs(char **query_strs, size_t query_strs_len) +{ + int i; + for (i = 0; i < query_strs_len; i++) + start_query_str(query_strs[i]); +} + +int main(int argc, char **argv) +{ + int rc = EXIT_FAILURE; + globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client"); + + osmo_init_logging2(globals.ctx, NULL); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_extended_timestamp(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + while (1) { + int c; + long long int val; + char *endptr; + int option_index = 0; + + static struct option long_options[] = { + { "format", 1, 0, 'f' }, + { "no-csv-headers", 0, 0, 'H' }, + { "daemon", 0, 0, 'd' }, + { "mdns-ip", 1, 0, 'm' }, + { "mdns-port", 1, 0, 'M' }, + { "mdns-domain-suffix", 1, 0, 'D' }, + { "timeout", 1, 0, 'T' }, + { "min-delay", 1, 0, 't' }, + { "socket", 1, 0, 's' }, + { "send", 0, 0, 'S' }, + { "quiet", 0, 0, 'q' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + {} + }; + +#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \ + int _rc; \ + TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \ + if (_rc) { \ + print_error("Invalid " #TARGET ": %s\n", optarg); \ + goto program_exit; \ + } \ + } while (0) + + c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index); + + if (c == -1) + break; + + switch (c) { + case 'f': + cmdline_opts.format_str = optarg; + break; + case 'H': + cmdline_opts.csv_headers = false; + break; + case 'd': + cmdline_opts.daemon = true; + break; + case 'm': + if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port) + || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) { + print_error("Invalid mDNS IP address: %s\n", optarg); + goto program_exit; + } + break; + case 'M': + PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535); + break; + case 'D': + cmdline_opts.mdns_domain_suffix = optarg; + break; + case 't': + PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX); + break; + case 'T': + PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX); + break; + case 's': + cmdline_opts.socket_path = optarg; + break; + case 'S': + cmdline_opts.send = true; + break; + case 'q': + cmdline_opts.quiet = true; + break; + + case 'h': + print_help(); + rc = 0; + goto program_exit; + case 'V': + print_version(); + rc = 0; + goto program_exit; + + default: + /* catch unknown options *as well as* missing arguments. */ + print_error("Error in command line options. Exiting.\n"); + goto program_exit; + } + } + + if (cmdline_opts.send) { + if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) { + print_error("--send option cannot have any listening related args."); + } + rc = do_send(argc - optind, argv + optind); + goto program_exit; + } + + if (!cmdline_opts.daemon && !(argc - optind)) { + print_help(); + goto program_exit; + } + + if (cmdline_opts.daemon && !cmdline_opts.timeout) { + print_error("In daemon mode, --timeout must not be zero.\n"); + goto program_exit; + } + + if (cmdline_opts.quiet) + log_target_destroy(osmo_stderr_target); + + if (cmdline_opts.format_str) { + if (osmo_str_startswith("json", cmdline_opts.format_str)) + globals.format = FORMAT_JSON; + else if (osmo_str_startswith("csv", cmdline_opts.format_str)) + globals.format = FORMAT_CSV; + else { + print_error("Invalid format: %s\n", cmdline_opts.format_str); + goto program_exit; + } + } + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + respond_str_stdout(CSV_HEADERS); + + globals.mslookup_client = osmo_mslookup_client_new(globals.ctx); + if (!globals.mslookup_client + || !osmo_mslookup_client_add_mdns(globals.mslookup_client, + cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + -1, cmdline_opts.mdns_domain_suffix)) { + print_error("Failed to start mDNS client\n"); + goto program_exit; + } + + if (cmdline_opts.socket_path) { + if (socket_init(cmdline_opts.socket_path)) + goto program_exit; + } + + start_query_strs(&argv[optind], argc - optind); + + while (1) { + osmo_select_main_ctx(0); + + if (!cmdline_opts.daemon + && globals.requests_handled + && llist_empty(&globals.queries)) + break; + } + + rc = 0; +program_exit: + osmo_mslookup_client_free(globals.mslookup_client); + socket_close(); + log_fini(); + talloc_free(globals.ctx); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:08:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 10 Jan 2020 16:08:15 +0000 Subject: Change in osmo-hlr[master]: fix missing braces in LOGP_GSUP_FWD In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16792 ) Change subject: fix missing braces in LOGP_GSUP_FWD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e Gerrit-Change-Number: 16792 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jan 2020 16:08:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 16:43:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 16:43:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 ) Change subject: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout ...................................................................... bsc: Introduce test TC_chan_rel_sccp_tiar_timeout Verify SCCP T(iar) timeout triggers release of established channel. Change-Id: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M library/Osmocom_VTY_Functions.ttcn 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/16798/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9c8d68d..11edc52 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -97,6 +97,11 @@ /* Osmux is enabled through VTY */ var boolean g_osmux_enabled := false; + /*Configure T(tias) over VTY, seconds */ + var integer g_bsc_sccp_timer_ias := 7 * 60; + /*Configure T(tiar) over VTY, seconds */ + var integer g_bsc_sccp_timer_iar := 15 *60; + /* global test case guard timer */ timer T_guard := 30.0; @@ -332,6 +337,8 @@ map(self:BSCVTY, system:BSCVTY); f_vty_set_prompts(BSCVTY); f_vty_transceive(BSCVTY, "enable"); + f_cs7_inst_0_cfg(BSCVTY, {"sccp-timer ias " & int2str(g_bsc_sccp_timer_ias), + "sccp-timer iar " & int2str(g_bsc_sccp_timer_iar)}); } /* global initialization function @@ -1064,6 +1071,20 @@ setverdict(pass); } +/* Verify T(iar) triggers and releases the channel */ +testcase TC_chan_rel_sccp_tiar_timeout() runs on test_CT { + var DchanTuple dt; + + g_bsc_sccp_timer_ias := 2; + g_bsc_sccp_timer_iar := 5; + + f_init(1); + + dt := f_est_dchan('23'O, 23, '00010203040506'O); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); + setverdict(pass); +} + /* Test behavior if RSL EST IND for non-active channel */ testcase TC_rll_est_ind_inact_lchan() runs on test_CT { timer T := 2.0; @@ -3632,6 +3653,15 @@ f_vty_transceive(BSCVTY, "end"); } +private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) +{ + f_vty_enter_cfg_cs7_inst(pt, 0); + for (var integer i := 0; i < sizeof(cmds); i := i+1) { + f_vty_transceive(pt, cmds[i]); + } + f_vty_transceive(pt, "end"); +} + private function f_probe_for_handover(charstring log_label, charstring log_descr, charstring handover_vty_cmd, @@ -4419,6 +4449,7 @@ execute( TC_chan_rel_hard_rlsd() ); execute( TC_chan_rel_hard_rlsd_ms_dead() ); execute( TC_chan_rel_a_reset() ); + execute( TC_chan_rel_sccp_tiar_timeout() ); execute( TC_outbound_connect() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index eb932ef..e266660 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -19,6 +19,7 @@ + diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index a1724e9..823d79f 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -102,6 +102,7 @@ type integer BtsTrxNr (0..255); type integer BtsTimeslotNr (0..7); type integer MscNr (0..255); + type integer Cs7Nr (0..255); type charstring BtsGprsMode ("none", "gprs", "egrps"); @@ -135,6 +136,11 @@ f_vty_transceive(pt, "msc " & int2str(msc)); } + function f_vty_enter_cfg_cs7_inst(TELNETasp_PT pt, Cs7Nr cs7_inst := 0) { + f_vty_enter_config(pt); + f_vty_transceive(pt, "cs7 instance " & int2str(cs7_inst)); + } + type record of charstring rof_charstring; function f_vty_config2(TELNETasp_PT pt, rof_charstring config_nodes, charstring cmd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 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: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c Gerrit-Change-Number: 16798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 18:10:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 18:10:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 to look at the new patch set (#2). Change subject: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout ...................................................................... bsc: Introduce test TC_chan_rel_sccp_tiar_timeout Verify SCCP T(iar) timeout triggers release of established channel. Change-Id: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M library/Osmocom_VTY_Functions.ttcn 3 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/16798/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 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: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c Gerrit-Change-Number: 16798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 18:10:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 18:10:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 ) Change subject: msc: WIP ...................................................................... msc: WIP Change-Id: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/16799/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 508acdd..0a70864 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -113,6 +113,11 @@ * handler is not active, which means that also no guard timer is * set up. The following timer will serve as a replacement */ timer Tguard_direct := 60.0; + + /* Configure T(tias) over VTY, seconds */ + var integer g_msc_sccp_timer_ias := 7 * 60; + /* Configure T(tiar) over VTY, seconds */ + var integer g_msc_sccp_timer_iar := 15 * 60; } modulepar { @@ -337,6 +342,8 @@ f_vty_config(MSCVTY, "msc", "assign-tmsi"); f_vty_config(MSCVTY, "msc", "check-imei-rqd 0"); f_vty_config(MSCVTY, "network", "encryption a5 0"); + f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer ias " & int2str(g_msc_sccp_timer_ias)); + f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer iar " & int2str(g_msc_sccp_timer_iar)); if (mp_enable_osmux_test) { if (osmux) { f_vty_config(MSCVTY, "msc", "osmux on"); @@ -676,6 +683,45 @@ vc_conn.done; } +/* Verify T(iar) triggers and releases the channel */ +friend function f_lu_and_mo_call_sccp_tiar_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + timer T_wait_iar := int2float(5 + 1); /* g_msc_sccp_timer_iar + Give extra time (+1 sec) */ + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + f_perform_lu(); + f_mo_call_establish(cpars); + + /* Expect the channel cleared upon T(iar) triggered: */ + T_wait_iar.start; + alt { + [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + T_wait_iar.stop + setverdict(pass); + } + [] MGCP.receive(tr_DLCX(?)) { repeat; } + [] T_wait_iar.timeout { + setverdict(fail, "Timeout waiting for T(iar) triggered SCCP RSLD"); + mtc.stop; + } + } + + setverdict(pass); +} +testcase TC_lu_and_mo_call_sccp_tiar_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + /* Set T(iar) in MSC low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_msc_sccp_timer_ias := 2; + g_msc_sccp_timer_iar := 5; + + f_init(); + + vc_conn := f_start_handler(refers(f_lu_and_mo_call_sccp_tiar_timeout), 89); + vc_conn.done; +} + /* Test LU (with authentication enabled), where HLR times out sending SAI response */ friend function f_tc_lu_auth_sai_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -5827,6 +5873,7 @@ execute( TC_lu_imsi_timeout_tmsi_realloc() ); execute( TC_cmserv_imsi_unknown() ); execute( TC_lu_and_mo_call() ); + execute( TC_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); execute( TC_lu_clear_request() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 586642b..342e0a2 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -80,6 +80,21 @@ vc_conn.done; } +testcase TC_iu_lu_and_mo_call_sccp_tiar_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + /* Set T(iar) in MSC low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_msc_sccp_timer_ias := 2; + g_msc_sccp_timer_iar := 5; + + f_init(3); + + vc_conn := f_start_handler(refers(f_lu_and_mo_call_sccp_tiar_timeout), 1019, ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_lu_auth_sai_timeout() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -476,6 +491,7 @@ execute( TC_iu_lu_imsi_timeout_tmsi_realloc() ); execute( TC_iu_cmserv_imsi_unknown() ); execute( TC_iu_lu_and_mo_call() ); + execute( TC_iu_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_iu_lu_auth_sai_timeout() ); execute( TC_iu_lu_auth_sai_err() ); execute( TC_iu_lu_release_request() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index a7b7142..0b0fd09 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -14,6 +14,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 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: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 Gerrit-Change-Number: 16799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 18:12:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jan 2020 18:12:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 to look at the new patch set (#2). Change subject: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout ...................................................................... msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout Verify SCCP T(iar) timeout triggers release of established channel. Related: OS#4343 Change-Id: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/16799/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 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: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 Gerrit-Change-Number: 16799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 22:08:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 22:08:27 +0000 Subject: Change in osmo-bts[master]: L1SAP: remove verbose logging from rach_pass_filter() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: remove verbose logging from rach_pass_filter() ...................................................................... L1SAP: remove verbose logging from rach_pass_filter() Due to relatively small training sequence of Access Bursts, there can be frequent false-positives (basically noise). Fortunately, we can distinguish them from the real Access Bursts by checking the signal measurements attached to them (BER, ToA and C/I). Let's avoid polluting the logs and do not print anything if the signal measurements exceed any of the thresholds. Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/00/16800/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b73de29..1be1a1a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1351,38 +1351,25 @@ #define RACH_MIN_TOA256 -2 * 256 -static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts, - const char *chan_name) +static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts) { int16_t toa256 = rach_ind->acc_delay_256bits; /* Check for RACH exceeding BER threshold (ghost RACH) */ - if (rach_ind->ber10k > bts->max_ber10k_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " - "BER10k(%u) > BER10k_MAX(%u)\n", chan_name, - rach_ind->ber10k, bts->max_ber10k_rach); + if (rach_ind->ber10k > bts->max_ber10k_rach) return false; - } /** * Make sure that ToA (Timing of Arrival) is acceptable. * We allow early arrival up to 2 symbols, and delay * according to maximal allowed Timing Advance value. */ - if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " - "ToA(%d) exceeds the allowed range (%d..%d)\n", chan_name, - toa256, RACH_MIN_TOA256, bts->max_ta * 256); + if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) return false; - } /* Link quality defined by C/I (Carrier-to-Interference ratio) */ - if (rach_ind->lqual_cb < bts->min_qual_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " - "link quality (%d) below the minimum (%d)\n", chan_name, - rach_ind->lqual_cb, bts->min_qual_rach); + if (rach_ind->lqual_cb < bts->min_qual_rach) return false; - } return true; } @@ -1391,7 +1378,7 @@ static int l1sap_handover_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts, "handover")) { + if (!rach_pass_filter(rach_ind, trx->bts)) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } @@ -1407,7 +1394,7 @@ static int l1sap_pdch_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts, "PDCH")) + if (!rach_pass_filter(rach_ind, trx->bts)) return -EAGAIN; /* PTCCH/U (Packet Timing Advance Control Channel) */ @@ -1459,7 +1446,7 @@ bts->load.rach.busy++; /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, bts, "CCCH")) { + if (!rach_pass_filter(rach_ind, bts)) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 10 23:18:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jan 2020 23:18:18 +0000 Subject: Change in osmo-bts[master]: common/vty.c: get rid of generic exit / end commands In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16338 to look at the new patch set (#2). Change subject: common/vty.c: get rid of generic exit / end commands ...................................................................... common/vty.c: get rid of generic exit / end commands Those commands are now handled by libosmovty itself. Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb --- M src/common/vty.c 1 file changed, 0 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/16338/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb Gerrit-Change-Number: 16338 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 00:00:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 00:00:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/3/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696/3/pcu/PCU_Tests_RAW.ttcn at 1395 PS3, Line 1395: var Could be 'const', but this is not critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 00:00:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 00:21:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 11 Jan 2020 00:21:37 +0000 Subject: Change in osmo-bts[master]: L1SAP: remove verbose logging from rach_pass_filter() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: remove verbose logging from rach_pass_filter() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 00:21:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 00:23:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 11 Jan 2020 00:23:23 +0000 Subject: Change in osmo-bts[master]: common/vty.c: get rid of generic exit / end commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16338 ) Change subject: common/vty.c: get rid of generic exit / end commands ...................................................................... Patch Set 2: Code-Review+1 I think it's important to note here that this commit can be merged since osmo-bts already depends on libosmocore 1.3.0 anyway, which is the version where libosmovty started handling this AFAIK. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb Gerrit-Change-Number: 16338 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 00:23:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 00:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 11 Jan 2020 00:24:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Check received IMSI suffix from PCUIF paging request In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 ) Change subject: pcu: Check received IMSI suffix from PCUIF paging request ...................................................................... pcu: Check received IMSI suffix from PCUIF paging request Change-Id: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d0181a9..ab412c4 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -366,13 +366,19 @@ } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ -private function f_pcuif_rx_pch_pag_req1(out GsmRrMessage rr_pag_req1) +private function f_pcuif_rx_pch_pag_req1(out integer imsi_suff_rx, out GsmRrMessage rr_pag_req1) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; + var octetstring imsi_suff_octstr; var octetstring macblock; BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; - /* First 3 bytes contain paging group: */ + /* First 3 bytes contain IMSI suffix to calculate paging group: */ + imsi_suff_octstr := substr(pcu_msg.u.data_req.data, 0, 3); + imsi_suff_rx := str2int(oct2char(imsi_suff_octstr[0])) * 100 + + str2int(oct2char(imsi_suff_octstr[1])) * 10 + + str2int(oct2char(imsi_suff_octstr[2])); + macblock := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); rr_pag_req1 := dec_GsmRrMessage(macblock); if (not match(rr_pag_req1, tr_PAG_REQ1())) { @@ -1385,7 +1391,9 @@ private function f_tc_paging_ps_from_sgsn(Nsvci bvci) runs on RAW_PCU_Test_CT { var GsmRrMessage rr_pag_req1; var OCT4 tlli := '00000001'O; - var hexstring imsi := f_gen_imsi(42); + var integer imsi_suff_rx; + var integer imsi_suff_tx := 423; + var hexstring imsi := f_gen_imsi(imsi_suff_tx); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1401,7 +1409,11 @@ BSSGP[0].send(ts_BSSGP_PS_PAGING_IMSI(bvci, imsi)); /* Receive it on BTS side towards MS */ - f_pcuif_rx_pch_pag_req1(rr_pag_req1); + f_pcuif_rx_pch_pag_req1(imsi_suff_rx, rr_pag_req1); + if (imsi_suff_rx != imsi_suff_tx) { + setverdict(fail, "Wrong IMSI suffix: expected ", imsi_suff_tx, " but received ", imsi_suff_rx); + mtc.stop; + } setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16696 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: Ia11447fb71ea0b6a8fcce1a28e93cc166d22ef7a Gerrit-Change-Number: 16696 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 11 01:51:39 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 01:51:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5e192a4232278_12e32ae013cea5f498967d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 364s] | #define STDC_HEADERS 1 [ 364s] | #define HAVE_SYS_TYPES_H 1 [ 364s] | #define HAVE_SYS_STAT_H 1 [ 364s] | #define HAVE_STDLIB_H 1 [ 364s] | #define HAVE_STRING_H 1 [ 364s] | #define HAVE_MEMORY_H 1 [ 364s] | #define HAVE_STRINGS_H 1 [ 364s] | #define HAVE_INTTYPES_H 1 [ 364s] | #define HAVE_STDINT_H 1 [ 364s] | #define HAVE_UNISTD_H 1 [ 364s] | #define HAVE_DLFCN_H 1 [ 364s] | #define LT_OBJDIR ".libs/" [ 364s] | #define PACKAGE "osmo-hlr" [ 364s] | #define VERSION "1.2.0.4-637b" [ 364s] | #define STDC_HEADERS 1 [ 364s] | [ 364s] | configure: exit 0 [ 364s] [ 364s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 364s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 364s] make: *** [debian/rules:7: build] Error 2 [ 364s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 364s] [ 364s] lamb12 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 01:51:32 UTC 2020. [ 364s] [ 364s] ### VM INTERACTION START ### [ 367s] [ 352.233884] sysrq: SysRq : Power Off [ 367s] [ 352.240338] reboot: Power down [ 367s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 01:52:48 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 01:52:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5e192a7d449d6_12e32ae013cea5f49898b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 217s] server_init [ 217s] -client_init [ 217s] -client_query [ 217s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 217s] -server_recv [ 217s] -received request [ 217s] -server_recv [ 217s] -client_recv [ 217s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 217s] -Total time passed: 5.000000 s [ 217s] -server_stop [ 217s] -client_stop [ 217s] +osmo_mdns_sock_init: setsockopt: No such device [ 217s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 217s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 1203 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 217s] stdout: [ 217s] ./testsuite.at:64: exit code was 134, expected 0 [ 217s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 217s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 217s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 217s] make: *** [debian/rules:7: build] Error 2 [ 217s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 217s] [ 217s] build75 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 01:52:32 UTC 2020. [ 217s] [ 217s] ### VM INTERACTION START ### [ 219s] [ 207.902545] sysrq: SysRq : Power Off [ 219s] [ 207.904260] reboot: Power down [ 219s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 01:53:56 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 01:53:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5e192abb41859_12e32ae013cea5f49901f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 302s] | #define HAVE_SYS_STAT_H 1 [ 302s] | #define HAVE_STDLIB_H 1 [ 302s] | #define HAVE_STRING_H 1 [ 302s] | #define HAVE_MEMORY_H 1 [ 302s] | #define HAVE_STRINGS_H 1 [ 302s] | #define HAVE_INTTYPES_H 1 [ 302s] | #define HAVE_STDINT_H 1 [ 302s] | #define HAVE_UNISTD_H 1 [ 302s] | #define HAVE_DLFCN_H 1 [ 302s] | #define LT_OBJDIR ".libs/" [ 302s] | #define PACKAGE "osmo-hlr" [ 302s] | #define VERSION "1.2.0.4-637b" [ 302s] | #define STDC_HEADERS 1 [ 302s] | [ 302s] | configure: exit 0 [ 302s] [ 302s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 302s] make[1]: *** [override_dh_auto_test] Error 1 [ 302s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 302s] debian/rules:7: recipe for target 'build' failed [ 302s] make: *** [build] Error 2 [ 302s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 302s] [ 302s] lamb02 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 01:53:44 UTC 2020. [ 302s] [ 302s] ### VM INTERACTION START ### [ 305s] [ 288.919603] sysrq: SysRq : Power Off [ 305s] [ 288.925407] reboot: Power down [ 305s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 01:56:12 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 01:56:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5e192b5057353_12e32ae013cea5f4990691@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 392s] -client_query [ 392s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 392s] -server_recv [ 392s] -received request [ 392s] -server_recv [ 392s] -client_recv [ 392s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 392s] -Total time passed: 5.000000 s [ 392s] -server_stop [ 392s] -client_stop [ 392s] +osmo_mdns_sock_init: setsockopt: No such device [ 392s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 392s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 4913 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 392s] stdout: [ 392s] ./testsuite.at:64: exit code was 134, expected 0 [ 392s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 392s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 392s] make[1]: *** [override_dh_auto_test] Error 1 [ 392s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 392s] debian/rules:7: recipe for target 'build' failed [ 392s] make: *** [build] Error 2 [ 392s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 392s] [ 392s] cloud113 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 01:55:52 UTC 2020. [ 392s] [ 392s] ### VM INTERACTION START ### [ 394s] [ 376.930021] sysrq: SysRq : Power Off [ 394s] [ 376.934866] reboot: Power down [ 394s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 01:56:12 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 01:56:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5e192b50e332f_12e32ae013cea5f499076e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 331s] | #define HAVE_SYS_STAT_H 1 [ 331s] | #define HAVE_STDLIB_H 1 [ 331s] | #define HAVE_STRING_H 1 [ 331s] | #define HAVE_MEMORY_H 1 [ 331s] | #define HAVE_STRINGS_H 1 [ 331s] | #define HAVE_INTTYPES_H 1 [ 331s] | #define HAVE_STDINT_H 1 [ 331s] | #define HAVE_UNISTD_H 1 [ 331s] | #define HAVE_DLFCN_H 1 [ 331s] | #define LT_OBJDIR ".libs/" [ 331s] | #define PACKAGE "osmo-hlr" [ 331s] | #define VERSION "1.2.0.4-637b" [ 331s] | #define STDC_HEADERS 1 [ 331s] | [ 331s] | configure: exit 0 [ 331s] [ 331s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 331s] make[1]: *** [override_dh_auto_test] Error 1 [ 331s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 331s] debian/rules:7: recipe for target 'build' failed [ 331s] make: *** [build] Error 2 [ 331s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 331s] [ 331s] build35 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 01:55:58 UTC 2020. [ 331s] [ 331s] ### VM INTERACTION START ### [ 334s] [ 318.519266] sysrq: SysRq : Power Off [ 334s] [ 318.528805] reboot: Power down [ 334s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:01:04 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:01:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5e192c7ce1b74_12e32ae013cea5f4991585@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 370s] | #define STDC_HEADERS 1 [ 370s] | #define HAVE_SYS_TYPES_H 1 [ 370s] | #define HAVE_SYS_STAT_H 1 [ 370s] | #define HAVE_STDLIB_H 1 [ 370s] | #define HAVE_STRING_H 1 [ 370s] | #define HAVE_MEMORY_H 1 [ 370s] | #define HAVE_STRINGS_H 1 [ 370s] | #define HAVE_INTTYPES_H 1 [ 370s] | #define HAVE_STDINT_H 1 [ 370s] | #define HAVE_UNISTD_H 1 [ 370s] | #define HAVE_DLFCN_H 1 [ 370s] | #define LT_OBJDIR ".libs/" [ 370s] | #define PACKAGE "osmo-hlr" [ 370s] | #define VERSION "1.2.0.4-637b" [ 370s] | #define STDC_HEADERS 1 [ 370s] | [ 370s] | configure: exit 0 [ 370s] [ 370s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 370s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 370s] make: *** [debian/rules:7: build] Error 2 [ 370s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 370s] [ 370s] lamb76 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:00:54 UTC 2020. [ 370s] [ 370s] ### VM INTERACTION START ### [ 373s] [ 357.932783] sysrq: SysRq : Power Off [ 373s] [ 357.944639] reboot: Power down [ 373s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:01:21 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:01:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5e192c7e336e1_12e32ae013cea5f49916f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 403s] | #define HAVE_SYS_TYPES_H 1 [ 403s] | #define HAVE_SYS_STAT_H 1 [ 403s] | #define HAVE_STDLIB_H 1 [ 403s] | #define HAVE_STRING_H 1 [ 403s] | #define HAVE_MEMORY_H 1 [ 403s] | #define HAVE_STRINGS_H 1 [ 403s] | #define HAVE_INTTYPES_H 1 [ 403s] | #define HAVE_STDINT_H 1 [ 403s] | #define HAVE_UNISTD_H 1 [ 403s] | #define HAVE_DLFCN_H 1 [ 403s] | #define LT_OBJDIR ".libs/" [ 403s] | #define PACKAGE "osmo-hlr" [ 403s] | #define VERSION "1.2.0.4-637b" [ 403s] | #define STDC_HEADERS 1 [ 403s] | [ 403s] | configure: exit 0 [ 403s] [ 403s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make: *** [debian/rules:7: build] Error 2 [ 403s] dpkg-build[ 388.316090] serial8250: too much work for irq4 [ 403s] package: error: debian/rules build subprocess returned exit status 2 [ 403s] [ 403s] lamb54 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:01:12 UTC 2020. [ 403s] [ 403s] ### VM INTERACTION START ### [ 406s] [ 391.409817] sysrq: SysRq : Power Off [ 406s] [ 391.424713] reboot: Power down [ 407s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:04:47 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:04:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5e192d50a5f3f_12e32ae013cea5f49934a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 358s] | #define STDC_HEADERS 1 [ 358s] | #define HAVE_SYS_TYPES_H 1 [ 358s] | #define HAVE_SYS_STAT_H 1 [ 358s] | #define HAVE_STDLIB_H 1 [ 358s] | #define HAVE_STRING_H 1 [ 358s] | #define HAVE_MEMORY_H 1 [ 358s] | #define HAVE_STRINGS_H 1 [ 358s] | #define HAVE_INTTYPES_H 1 [ 358s] | #define HAVE_STDINT_H 1 [ 358s] | #define HAVE_UNISTD_H 1 [ 358s] | #define HAVE_DLFCN_H 1 [ 358s] | #define LT_OBJDIR ".libs/" [ 358s] | #define PACKAGE "osmo-hlr" [ 358s] | #define VERSION "1.2.0.4-637b" [ 358s] | #define STDC_HEADERS 1 [ 358s] | [ 358s] | configure: exit 0 [ 358s] [ 358s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 358s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 358s] make: *** [debian/rules:7: build] Error 2 [ 358s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 358s] [ 358s] lamb27 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:04:28 UTC 2020. [ 358s] [ 358s] ### VM INTERACTION START ### [ 362s] [ 345.851008] sysrq: SysRq : Power Off [ 362s] [ 345.857103] reboot: Power down [ 362s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:07:21 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:07:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5e192de550484_12e32ae013cea5f499440@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 296s] | #define HAVE_SYS_STAT_H 1 [ 296s] | #define HAVE_STDLIB_H 1 [ 296s] | #define HAVE_STRING_H 1 [ 296s] | #define HAVE_MEMORY_H 1 [ 296s] | #define HAVE_STRINGS_H 1 [ 296s] | #define HAVE_INTTYPES_H 1 [ 296s] | #define HAVE_STDINT_H 1 [ 296s] | #define HAVE_UNISTD_H 1 [ 296s] | #define HAVE_DLFCN_H 1 [ 296s] | #define LT_OBJDIR ".libs/" [ 296s] | #define PACKAGE "osmo-hlr" [ 296s] | #define VERSION "1.2.0.4-637b" [ 296s] | #define STDC_HEADERS 1 [ 296s] | [ 296s] | configure: exit 0 [ 296s] [ 296s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 296s] make[1]: *** [override_dh_auto_test] Error 1 [ 296s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 296s] debian/rules:7: recipe for target 'build' failed [ 296s] make: *** [build] Error 2 [ 296s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 296s] [ 296s] lamb60 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:07:11 UTC 2020. [ 296s] [ 296s] ### VM INTERACTION START ### [ 299s] [ 283.341379] sysrq: SysRq : Power Off [ 299s] [ 283.354237] reboot: Power down [ 299s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:09:04 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:09:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e192e5de7cd0_12e32ae013cea5f49952c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 394s] | #define STDC_HEADERS 1 [ 394s] | #define HAVE_SYS_TYPES_H 1 [ 394s] | #define HAVE_SYS_STAT_H 1 [ 394s] | #define HAVE_STDLIB_H 1 [ 394s] | #define HAVE_STRING_H 1 [ 394s] | #define HAVE_MEMORY_H 1 [ 394s] | #define HAVE_STRINGS_H 1 [ 394s] | #define HAVE_INTTYPES_H 1 [ 394s] | #define HAVE_STDINT_H 1 [ 394s] | #define HAVE_UNISTD_H 1 [ 394s] | #define HAVE_DLFCN_H 1 [ 394s] | #define LT_OBJDIR ".libs/" [ 394s] | #define PACKAGE "osmo-hlr" [ 394s] | #define VERSION "1.2.0.4-637b" [ 394s] | #define STDC_HEADERS 1 [ 394s] | [ 394s] | configure: exit 0 [ 394s] [ 394s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 394s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 394s] make: *** [debian/rules:7: build] Error 2 [ 394s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 394s] [ 394s] lamb23 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:08:53 UTC 2020. [ 394s] [ 394s] ### VM INTERACTION START ### [ 397s] [ 379.144755] sysrq: SysRq : Power Off [ 397s] [ 379.150703] reboot: Power down [ 397s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:10:12 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:10:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e192e99a940f_12e32ae013cea5f49953a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 403s] server_init [ 403s] -client_init [ 403s] -client_query [ 403s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 403s] -server_recv [ 403s] -received request [ 403s] -server_recv [ 403s] -client_recv [ 403s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 403s] -Total time passed: 5.000000 s [ 403s] -server_stop [ 403s] -client_stop [ 403s] +osmo_mdns_sock_init: setsockopt: No such device [ 403s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 403s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 2082 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 403s] stdout: [ 403s] ./testsuite.at:64: exit code was 134, expected 0 [ 403s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 403s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make: *** [debian/rules:7: build] Error 2 [ 403s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 403s] [ 403s] lamb25 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 02:10:05 UTC 2020. [ 403s] [ 403s] ### VM INTERACTION START ### [ 407s] [ 388.096952] sysrq: SysRq : Power Off [ 407s] [ 388.120191] reboot: Power down [ 407s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:15:55 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:15:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5e192fe59c78e_12e32ae013cea5f4996384@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 498s] | configure:8398: result: yes (GNU style) [ 498s] | configure:8431: checking whether make supports nested variables [ 498s] | configure:8448: result: yes [ 498s] | configure:8533: checking dependency style of gcc [ 498s] | configure:8644: result: none [ 498s] | configure:8717: checking whether make supports nested variables [ 498s] | configure:8734: result: yes [ 498s] | configure:8749: checking whether make sets $(MAKE) [ 498s] | configure:8771: result: yes [ 498s] | configure:8829: checking for gcc [ 498s] | configure:8856: result: gcc [ 498s] | configure:9085: checking for C compiler version [ 498s] | configure:9094: gcc --version >&5 [ 498s] | gcc (Debian 8.3.0-6) 8.3.0 [ 498s] | Copyright (C) 2018 Free Software Foundation, Inc. [ 498s] | This is free software; see the source for copying conditions. There is NO [ 498s] | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. [ 498s] | [ 498s] | configure:9105: $? = 0 [ 498s] | configure:9094: gcc -v >&5 [ 498s] | Using built-in specs. [ 498s] | COLLECT_GCC=gcc [ 498s] | COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/8/lto-wrapper [ 498s] | OFFLOAD_TARGET_NAMES=nvptx-none [ 498s] | OFFLOAD_TARGET_DEFAULT=1 [ 498s] | Target: x86_64-linux-gnu [ 500s] | Configured with: ../src/configure -v --with-pkgversion='Debian 8.3.0-6' --with-bugurl=file:///usr/share/doc/gcc-8/README.Bugs --enable-languages=c,ada,c++,go,brig,d,fortran,objc,obj-c++ --prefix=/usr --with-gcc-major-version-only --program-suffix=-8 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx[ 482.165842] sysrq: SysRq : Power Off [ 501s] [ 482.223133] reboot: Power down [ 501s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:53:21 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:53:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5e1938af52754_12e32ae013cea5f4100404@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 640s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 640s] | | #define PACKAGE_URL "" [ 640s] | | /* end confdefs.h. */ [ 640s] | | #include [ 640s] | configure:6734: result: gcc -E [ 640s] | configure:6754: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c [ 640s] | configure:6754: $? = 0 [ 640s] | configure:6768: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c [ 640s] | conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory [ 640s] | #include [ 640s] | ^ [ 640s] | compilation terminated. [ 640s] | configure:6768: $? = 1 [ 640s] | configure: failed program was: [ 640s] | | /* confdefs.h */ [ 640s] | | #define PACKAGE_NAME "osmo-hlr" [ 640s] | | #define PACKAGE_TARNAME "osmo-hlr" [ 640s] | | #define PACKAGE_VERSION "1.2.0.4-637b" [ 640s] | | #define PACKAGE_STRING "osmo-hlr 1.2.0.4-637b" [ 640s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 640s] | | #define PACKAGE_URL "" [ 640s] | | /* end confdefs.h. */ [ 640s] | | #include [ 640s] | configure:6797: checking for ANSI C header files [ 640s] | configure:6817: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 640s] | configure:6817: $? = 0 [ 642s] | configure:6890: gcc -o conftest -g[ 603.627596] sysrq: SysRq : Power Off [ 642s] [ 603.652752] reboot: Power down [ 642s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 02:57:55 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 02:57:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5e1939b931182_12e32ae013cea5f41004927@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 784s] | configure:6701: $? = 0 [ 784s] | configure:6715: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c [ 784s] | conftest.c:9:10: fatal error: ac_nonexistent.h: No such file or directory [ 784s] | #include [ 784s] | ^~~~~~~~~~~~~~~~~~ [ 784s] | compilation terminated. [ 784s] | configure:6715: $? = 1 [ 784s] | configure: failed program was: [ 784s] | | /* confdefs.h */ [ 784s] | | #define PACKAGE_NAME "osmo-hlr" [ 784s] | | #define PACKAGE_TARNAME "osmo-hlr" [ 784s] | | #define PACKAGE_VERSION "1.2.0.4-637b" [ 784s] | | #define PACKAGE_STRING "osmo-hlr 1.2.0.4-637b" [ 784s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 784s] | | #define PACKAGE_URL "" [ 784s] | | /* end confdefs.h. */ [ 784s] | | #include [ 784s] | configure:6744: checking for ANSI C header files [ 784s] | configure:6764: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 784s] | configure:6764: $? = 0 [ 784s] | configure:6837: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now conftest.c >&5 [ 784s] | configure:6837: $? = 0 [ 784s] | configure:6837: ./conftest [ 784s] | configure:6837: $? = 0 [ 784s] | configure:6848: result: yes [ 784s] | configure:6861: checking for sys/types.h [ 786s] | configure:6861: gcc -c -g -O2 -fdeb[ 751.941042] sysrq: Power Off [ 786s] [ 751.959856] reboot: Power down [ 786s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 04:46:00 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 04:46:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5e19530aaf9d3_12e32ae013cea5f410247f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 860s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 860s] -server_recv [ 860s] -received request [ 860s] -server_recv [ 860s] -client_recv [ 860s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 860s] -Total time passed: 5.000000 s [ 860s] -server_stop [ 860s] -client_stop [ 860s] +osmo_mdns_sock_init: setsockopt: No such device [ 860s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 860s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 1452 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 860s] stdout: [ 860s] backtrace() returned 0 addresses [ 860s] ./testsuite.at:64: exit code was 134, expected 0 [ 860s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 860s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 860s] make[1]: *** [override_dh_auto_test] Error 1 [ 860s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 860s] debian/rules:7: recipe for target 'build' failed [ 860s] make: *** [build] Error 2 [ 860s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 860s] [ 860s] obs-arm-5 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 04:45:52 UTC 2020. [ 860s] [ 860s] ### VM INTERACTION START ### [ 862s] [ 830.763222] sysrq: SysRq : Power Off [ 862s] [ 830.765483] reboot: Power down [ 864s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 05:03:08 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 05:03:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e195724be68f_12e32ae013cea5f410268e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 905s] | ac_cv_prog_make_make_set=yes [ 905s] | am_cv_CC_dependencies_compiler_type=none [ 905s] | am_cv_make_support_nested_variables=yes [ 905s] | am_cv_prog_cc_c_o=yes [ 905s] | lt_cv_ar_at_file=@ [ 905s] | lt_cv_archive_cmds_need_lc=no [ 905s] | lt_cv_deplibs_check_method=pass_all [ 905s] | lt_cv_file_magic_cmd='$MAGIC_CMD' [ 905s] | lt_cv_file_magic_test_file= [ 905s] | lt_cv_ld_reload_flag=-r [ 905s] | lt_cv_nm_interface='BSD nm' [ 905s] | lt_cv_objdir=.libs [ 905s] | lt_cv_path_LD=/usr/bin/ld [ 905s] | lt_cv_path_NM='/usr/bin/nm -B' [ 905s] | lt_cv_path_mainfest_tool=no [ 905s] | lt_cv_prog_compiler_c_o=yes [ 905s] | lt_cv_prog_compiler_pic='-fPIC -DPIC' [ 905s] | lt_cv_prog_compiler_pic_works=yes [ 905s] | lt_cv_prog_compiler_rtti_exceptions=no [ 905s] | lt_cv_prog_compiler_static_works=yes [ 905s] | lt_cv_prog_gnu_ld=yes [ 905s] | lt_cv_sharedlib_from_linklib_cmd='printf %s\n' [ 905s] | lt_cv_shlibpath_overrides_runpath=yes [ 905s] | lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' [ 905s] | lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \(.*\) .*$/ {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/ {"\1", (void *) \&\1},/p'\''' [ 905s] | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\) .*$/ {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(lib.*\)$/ {"\1", (void *) \&\1},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/ {"lib\1", (void *) \&\1},/p'\''' [ 907s] | lt_cv_sys_global_symbol_to_cdecl='s[ 837.882382] sysrq: SysRq : Power Off [ 907s] [ 837.884655] reboot: Power down [ 908s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 05:05:25 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 05:05:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/armv7l In-Reply-To: References: Message-ID: <5e19579dc977e_12e32ae013cea5f41027536@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1012s] server_init [ 1012s] -client_init [ 1012s] -client_query [ 1012s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 1012s] -server_recv [ 1012s] -received request [ 1012s] -server_recv [ 1012s] -client_recv [ 1012s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 1012s] -Total time passed: 5.000000 s [ 1012s] -server_stop [ 1012s] -client_stop [ 1012s] +osmo_mdns_sock_init: setsockopt: No such device [ 1012s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 1012s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 1742 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 1012s] stdout: [ 1012s] ./testsuite.at:64: exit code was 134, expected 0 [ 1012s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 1012s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 1012s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1012s] make: *** [debian/rules:7: build] Error 2 [ 1012s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1012s] [ 1012s] armbuild25 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 05:05:04 UTC 2020. [ 1012s] [ 1012s] ### VM INTERACTION START ### [ 1015s] [ 926.155144] sysrq: SysRq : Power Off [ 1015s] [ 926.157665] reboot: Power down [ 1015s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 13:24:00 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 13:24:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e19cc91dda6_12e32ae013cea5f411615ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 785s] | #define STDC_HEADERS 1 [ 785s] | #define HAVE_SYS_TYPES_H 1 [ 785s] | #define HAVE_SYS_STAT_H 1 [ 785s] | #define HAVE_STDLIB_H 1 [ 785s] | #define HAVE_STRING_H 1 [ 785s] | #define HAVE_MEMORY_H 1 [ 785s] | #define HAVE_STRINGS_H 1 [ 785s] | #define HAVE_INTTYPES_H 1 [ 785s] | #define HAVE_STDINT_H 1 [ 785s] | #define HAVE_UNISTD_H 1 [ 785s] | #define HAVE_DLFCN_H 1 [ 785s] | #define LT_OBJDIR ".libs/" [ 785s] | #define PACKAGE "osmo-hlr" [ 785s] | #define VERSION "1.2.0.4-637b" [ 785s] | #define STDC_HEADERS 1 [ 785s] | [ 785s] | configure: exit 0 [ 785s] [ 785s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 785s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 785s] make: *** [debian/rules:7: build] Error 2 [ 785s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 785s] [ 785s] lamb04 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 13:23:51 UTC 2020. [ 785s] [ 785s] ### VM INTERACTION START ### [ 788s] [ 763.988258] sysrq: SysRq : Power Off [ 788s] [ 763.993450] reboot: Power down [ 788s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jan 11 13:24:16 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 13:24:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e19cc9240049_12e32ae013cea5f41161683@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1133s] | #define STDC_HEADERS 1 [ 1133s] | #define HAVE_SYS_TYPES_H 1 [ 1133s] | #define HAVE_SYS_STAT_H 1 [ 1133s] | #define HAVE_STDLIB_H 1 [ 1133s] | #define HAVE_STRING_H 1 [ 1133s] | #define HAVE_MEMORY_H 1 [ 1133s] | #define HAVE_STRINGS_H 1 [ 1133s] | #define HAVE_INTTYPES_H 1 [ 1133s] | #define HAVE_STDINT_H 1 [ 1133s] | #define HAVE_UNISTD_H 1 [ 1133s] | #define HAVE_DLFCN_H 1 [ 1133s] | #define LT_OBJDIR ".libs/" [ 1133s] | #define PACKAGE "osmo-hlr" [ 1133s] | #define VERSION "1.2.0.4-637b" [ 1133s] | #define STDC_HEADERS 1 [ 1133s] | [ 1133s] | configure: exit 0 [ 1133s] [ 1133s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 1133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1133s] make: *** [debian/rules:7: build] Error 2 [ 1133s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1133s] [ 1133s] lamb24 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 13:24:05 UTC 2020. [ 1133s] [ 1133s] ### VM INTERACTION START ### [ 1136s] [ 1067.248744] sysrq: SysRq : Power Off [ 1136s] [ 1067.262609] reboot: Power down [ 1136s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jan 11 14:48:55 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 14:48:55 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 23: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py File contrib/dgsm/esme_dgsm.py: https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 48 PS18, Line 48: " example, dropping message.") > Sorry to hear that there's a bug in RCCN :\ > Fixed now! Thanks to this bringing it to my attention! -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 14:48:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: keith Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 16:27:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 16:27:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 ) Change subject: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel ...................................................................... MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel Since Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba we can have up to 16 components of type BSC_ConnHdlr running in parallel. Both TC_multi_lu_and_{mo,mt}_ussd test cases have been updated, but their Iu/UMTS siblings have not. Let's fix this. Change-Id: Iaa7347e973ee617cc1780b84e0c298f0a302227c --- M msc/MSC_Tests_Iu.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/16801/1 diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index b6b0983..cd9ed46 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -465,7 +465,7 @@ /* Verify multiple concurrent MO SS/USSD transactions * (one subscriber - one transaction) */ testcase TC_iu_multi_lu_and_mo_ussd() runs on MTC_CT { - var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlr vc_conn[16]; var BSC_ConnHdlrPars pars; var integer i; @@ -484,14 +484,14 @@ /* Verify multiple concurrent MT SS/USSD transactions * (one subscriber - one transaction) */ testcase TC_iu_multi_lu_and_mt_ussd() runs on MTC_CT { - var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlr vc_conn[16]; var BSC_ConnHdlrPars pars; var integer i; f_init(3); for (i := 0; i < sizeof(vc_conn); i := i + 1) { - pars := f_init_pars(1110 + i, ran_idx := 2, ran_is_geran := false, + pars := f_init_pars(1116 + i, ran_idx := 2, ran_is_geran := false, gsup_sid := '200001'O & int2oct(i, 1)); vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), pars); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 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: Iaa7347e973ee617cc1780b84e0c298f0a302227c Gerrit-Change-Number: 16801 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 16:56:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jan 2020 16:56:20 +0000 Subject: Change in simtrace2[master]: firmware: move printing of welcome banner to common function print_ba... References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16802 ) Change subject: firmware: move printing of welcome banner to common function print_banner() ...................................................................... firmware: move printing of welcome banner to common function print_banner() This unifies the printing of the welcome banner, and it also ensures that all modes print all information (serial number, reset cause). Furthermore the APP and BOARD #defines from the make environment are also printed. Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a --- M firmware/Makefile M firmware/apps/cardem/main.c M firmware/apps/trace/main.c M firmware/apps/triple_play/main.c A firmware/libcommon/include/main_common.h A firmware/libcommon/source/main_common.c 6 files changed, 64 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/02/16802/1 diff --git a/firmware/Makefile b/firmware/Makefile index bd634aa..5c7aa92 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -99,7 +99,8 @@ C_LIBUSB = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c C_LIBUSB_RT = dfu.c dfu_runtime.c C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c -C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c +C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c \ + main_common.c C_BOARD = $(notdir $(wildcard libboard/common/source/*.c)) C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 2f7bcd5..f6a5ab5 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -24,10 +24,9 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "main_common.h" #include -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -154,34 +153,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\n\r\n\r" - "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION "\n\r" - "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" - "=============================================================================\n\r"); - -#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) - TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos; - static const char* reset_causes[] = { - "general reset (first power-up reset)", - "backup reset (return from backup mode)", - "watchdog reset (watchdog fault occurred)", - "software reset (processor reset required by the software)", - "user reset (NRST pin detected low)", - }; - if (reset_cause < ARRAY_SIZE(reset_causes)) { - TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); - } else { - TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); - } -#endif - + print_banner(); board_main_top(); TRACE_INFO("USB init...\n\r"); diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c index 97455fb..08d6120 100644 --- a/firmware/apps/trace/main.c +++ b/firmware/apps/trace/main.c @@ -24,10 +24,9 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "main_common.h" #include "osmocom/core/timer.h" -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -158,20 +157,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\n\r\n\r" - "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" - "=============================================================================\n\r"); - - TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); - TRACE_INFO("USB configuration used: %d\n\r", simtrace_config); - + print_banner(); board_main_top(); TRACE_INFO("USB init...\n\r"); diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c index b81abdd..d22687e 100644 --- a/firmware/apps/triple_play/main.c +++ b/firmware/apps/triple_play/main.c @@ -26,8 +26,6 @@ #include "req_ctx.h" #include -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -149,17 +147,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\r\n\r\n" - "=============================================================================\r\n" - "SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n" - "=============================================================================\r\n"); - - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - + print_banner(); board_main_top(); TRACE_INFO("USB init...\r\n"); diff --git a/firmware/libcommon/include/main_common.h b/firmware/libcommon/include/main_common.h new file mode 100644 index 0000000..ce19f81 --- /dev/null +++ b/firmware/libcommon/include/main_common.h @@ -0,0 +1,3 @@ +#pragma once + +void print_banner(void); diff --git a/firmware/libcommon/source/main_common.c b/firmware/libcommon/source/main_common.c new file mode 100644 index 0000000..3314595 --- /dev/null +++ b/firmware/libcommon/source/main_common.c @@ -0,0 +1,54 @@ +/* SIMtrace 2 firmware common main helpers + * + * (C) 2015-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "board.h" +#include "utils.h" + +void print_banner(void) +{ + printf("\n\r\n\r" + "=============================================================================\n\r" + "SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\n\r" + "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" + "=============================================================================\n\r"); + +#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) + /* print chip-unique ID */ + unsigned int unique_id[4]; + EEFC_ReadUniqueID(unique_id); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", + unique_id[0], unique_id[1], unique_id[2], unique_id[3]); + + /* print reset cause */ + uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos; + static const char* reset_causes[] = { + "general reset (first power-up reset)", + "backup reset (return from backup mode)", + "watchdog reset (watchdog fault occurred)", + "software reset (processor reset required by the software)", + "user reset (NRST pin detected low)", + }; + if (reset_cause < ARRAY_SIZE(reset_causes)) { + TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); + } else { + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + } +#endif +} -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a Gerrit-Change-Number: 16802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 16:56:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jan 2020 16:56:21 +0000 Subject: Change in simtrace2[master]: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16803 ) Change subject: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c ...................................................................... firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c In the end we want to share most of this, irrespective of the "APP". Let's avoid unnecessary differences. Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a --- M firmware/apps/cardem/main.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/16803/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index f6a5ab5..3476af2 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -39,7 +39,7 @@ void (*exit) (void); /* main loop content for given configuration */ void (*run) (void); - /* Interrupt handler for USART1 */ + /* Interrupt handler for USART0 */ void (*usart0_irq) (void); /* Interrupt handler for USART1 */ void (*usart1_irq) (void); @@ -53,6 +53,8 @@ .init = Sniffer_init, .exit = Sniffer_exit, .run = Sniffer_run, + .usart0_irq = Sniffer_usart0_irq, + .usart1_irq = Sniffer_usart1_irq, }, #endif #ifdef HAVE_CCID @@ -174,8 +176,7 @@ } TRACE_INFO("calling configure of all configurations...\n\r"); - for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); - ++i) { + for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) { if (config_func_ptrs[i].configure) config_func_ptrs[i].configure(); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a Gerrit-Change-Number: 16803 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 16:56:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jan 2020 16:56:22 +0000 Subject: Change in simtrace2[master]: firmware: More common infrastructure for USB handling References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16804 ) Change subject: firmware: More common infrastructure for USB handling ...................................................................... firmware: More common infrastructure for USB handling Let's move low-level handling of endpoint queue refill from the individual apps into common/shared code. Now the main simply has to call usb_process() for every interface, and inbound messages will be dispatched to call-back functions from there. Change-Id: Ic6f9c6c1ffdbb0c9c3b284371ecc83b17e3be746 --- M firmware/apps/cardem/main.c M firmware/libcommon/include/usb_buf.h M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/mode_cardemu.c M firmware/libcommon/source/sniffer.c 5 files changed, 109 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/04/16804/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 3476af2..3170a9e 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -220,6 +220,7 @@ } last_simtrace_config = simtrace_config; } else { + //FIXME: usb_proces() for every interface in this configuration? if (config_func_ptrs[simtrace_config].run) { config_func_ptrs[simtrace_config].run(); } diff --git a/firmware/libcommon/include/usb_buf.h b/firmware/libcommon/include/usb_buf.h index 3a4eda2..4c795a8 100644 --- a/firmware/libcommon/include/usb_buf.h +++ b/firmware/libcommon/include/usb_buf.h @@ -42,5 +42,15 @@ void usb_buf_init(void); struct usb_buffered_ep *usb_get_buf_ep(uint8_t ep); -int usb_refill_to_host(uint8_t ep); -int usb_refill_from_host(uint8_t ep); +struct usb_if { + uint8_t if_num; /* interface number */ + uint8_t ep_out; /* OUT endpoint (0 if none) */ + uint8_t ep_in; /* IN endpint (0 if none) */ + uint8_t ep_int; /* INT endpoint (0 if none) */ + void *data; /* opaque data, passed through */ + struct { + /* call-back to be called for inclming messages on OUT EP */ + void (*rx_out)(struct msgb *msg, const struct usb_if *usb_if); + } ops; +}; +void usb_process(const struct usb_if *usb_if); diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 9a6e5b3..e367b37 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -57,7 +57,7 @@ } /* check if the spcified IN endpoint is idle and submit the next buffer from queue */ -int usb_refill_to_host(uint8_t ep) +static int usb_refill_to_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); struct msgb *msg; @@ -130,7 +130,7 @@ } /* refill the read queue for data received from host PC on OUT EP, if needed */ -int usb_refill_from_host(uint8_t ep) +static int usb_refill_from_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); struct msgb *msg; @@ -198,3 +198,45 @@ return ret; } + + + +/* iterate over the queue of incoming USB commands and dispatch/execute + * them */ +static void process_any_usb_commands(const struct usb_if *usb_if) +{ + struct llist_head *queue = usb_get_queue(usb_if->ep_out); + struct llist_head *lh; + struct msgb *msg; + int i; + + /* limit the number of iterations to 10, to ensure we don't get + * stuck here without returning to main loop processing */ + for (i = 0; i < 10; i++) { + /* de-queue the list head in an irq-safe way */ + lh = llist_head_dequeue_irqsafe(queue); + if (!lh) + break; + msg = llist_entry(lh, struct msgb, list); + usb_if->ops.rx_out(msg, usb_if); + } +} + +/* perform any action related to USB processing (IRQ/INT/OUT EP refill, handling OUT) */ +void usb_process(const struct usb_if *usb_if) +{ + /* first try to send any pending messages on IRQ */ + if (usb_if->ep_int) + usb_refill_to_host(usb_if->ep_int); + + /* then try to send any pending messages on IN */ + if (usb_if->ep_in) + usb_refill_to_host(usb_if->ep_in); + + /* ensure we can handle incoming USB messages from the + * host */ + if (usb_if->ep_out) { + usb_refill_from_host(usb_if->ep_out); + process_any_usb_commands(usb_if); + } +} diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index c5c173f..cab3cdf 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -34,6 +34,8 @@ #define TRACE_ENTRY() TRACE_DEBUG("%s entering\r\n", __func__) +static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if); + #ifdef PINS_CARDSIM static const Pin pins_cardsim[] = PINS_CARDSIM; #endif @@ -56,9 +58,7 @@ struct ringbuf rb; struct Usart_info usart_info; int usb_pending_old; - uint8_t ep_out; - uint8_t ep_in; - uint8_t ep_int; + struct usb_if usb_if; const Pin pin_insert; #ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; @@ -77,9 +77,16 @@ .id = ID_USART1, .state = USART_RCV }, - .ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT, - .ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, - .ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT, + .usb_if = { + .if_num = 0, + .ep_out = SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT, + .ep_in = SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, + .ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT, + .data = &cardem_inst[0], + .ops = { + .rx_out = dispatch_received_usb_msg, + }, + }, #ifdef PIN_SET_USIM1_PRES .pin_insert = PIN_SET_USIM1_PRES, #endif @@ -92,9 +99,16 @@ .id = ID_USART0, .state = USART_RCV }, - .ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT, - .ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, - .ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT, + .usb_if = { + .if_num = 1, + .ep_out = SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT, + .ep_in = SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, + .ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT, + .data = &cardem_inst[1], + .ops = { + .rx_out = dispatch_received_usb_msg, + }, + } #ifdef PIN_SET_USIM2_PRES .pin_insert = PIN_SET_USIM2_PRES, #endif @@ -621,8 +635,9 @@ } /* handle a single USB command as received from the USB host */ -static void dispatch_usb_command(struct msgb *msg, struct cardem_inst *ci) +static void dispatch_usb_command(struct msgb *msg, const struct usb_if *usb_if) { + struct cardem_inst *ci = usb_if->data; struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *) msg->l1h; if (msgb_length(msg) < sizeof(*sh)) { @@ -651,7 +666,8 @@ } } -static void dispatch_received_msg(struct msgb *msg, struct cardem_inst *ci) +/* handle a single USB transfer as received from the USB host */ +static void dispatch_received_usb_msg(struct msgb *msg, const struct usb_if *usb_if) { struct msgb *segm; struct simtrace_msg_hdr *mh; @@ -662,7 +678,7 @@ mh = (struct simtrace_msg_hdr *) msg->data; if (mh->msg_len == msgb_length(msg)) { /* fast path: only one message in buffer */ - dispatch_usb_command(msg, ci); + dispatch_usb_command(msg, usb_if); return; } @@ -671,22 +687,22 @@ while (1) { mh = (struct simtrace_msg_hdr *) msg->data; - segm = usb_buf_alloc(ci->ep_out); + segm = usb_buf_alloc(usb_if->ep_out); if (!segm) { TRACE_ERROR("%u: ENOMEM during msg segmentation\r\n", - ci->num); + usb_if->if_num); break; } if (mh->msg_len > msgb_length(msg)) { TRACE_ERROR("%u: Unexpected large message (%u bytes)\n", - ci->num, mh->msg_len); + usb_if->if_num, mh->msg_len); usb_buf_free(segm); } else { uint8_t *cur = msgb_put(segm, mh->msg_len); segm->l1h = segm->head; memcpy(cur, mh, mh->msg_len); - dispatch_usb_command(segm, ci); + dispatch_usb_command(segm, usb_if); } /* pull this message */ msgb_pull(msg, mh->msg_len); @@ -698,35 +714,14 @@ usb_buf_free(msg); } -/* iterate over the queue of incoming USB commands and dispatch/execute - * them */ -static void process_any_usb_commands(struct llist_head *main_q, - struct cardem_inst *ci) -{ - struct llist_head *lh; - struct msgb *msg; - int i; - - /* limit the number of iterations to 10, to ensure we don't get - * stuck here without returning to main loop processing */ - for (i = 0; i < 10; i++) { - /* de-queue the list head in an irq-safe way */ - lh = llist_head_dequeue_irqsafe(main_q); - if (!lh) - break; - msg = llist_entry(lh, struct msgb, list); - dispatch_received_msg(msg, ci); - } -} - /* main loop function, called repeatedly */ void mode_cardemu_run(void) { - struct llist_head *queue; unsigned int i; for (i = 0; i < ARRAY_SIZE(cardem_inst); i++) { struct cardem_inst *ci = &cardem_inst[i]; + struct usb_if *usb_if = &ci->usb_if; /* drain the ring buffer from UART into card_emu */ while (1) { @@ -743,16 +738,6 @@ process_io_statechg(ci); - /* first try to send any pending messages on IRQ */ - usb_refill_to_host(ci->ep_int); - - /* then try to send any pending messages on IN */ - usb_refill_to_host(ci->ep_in); - - /* ensure we can handle incoming USB messages from the - * host */ - usb_refill_from_host(ci->ep_out); - queue = usb_get_queue(ci->ep_out); - process_any_usb_commands(queue, ci); + usb_process(&ci->usb_if); } } diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 08770e2..78413ec 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -974,20 +974,28 @@ usb_msg_upd_len_and_submit(usb_msg); } +/* handle incoming message from USB OUT EP */ +static void dispatch_usb_out(struct msgb *msg, const struct usb_if *usb_if) +{ + /* currently we don't need any incoming data */ + msgb_free(msg); +} + +static const struct usb_if sniffer_usb_if = { + .if_num = 0, + .ep_in = SIMTRACE_USB_EP_CARD_DATAIN, + .ep_int = SIMTRACE_USB_EP_CARD_INT, + .ep_out = SIMTRACE_USB_EP_CARD_DATAOUT, + .ops = { + .rx_out = dispatch_usb_out, + } +}; + /* Main (idle/busy) loop of this USB configuration */ void Sniffer_run(void) { /* Handle USB queue */ - /* first try to send any pending messages on INT */ - usb_refill_to_host(SIMTRACE_USB_EP_CARD_INT); - /* then try to send any pending messages on IN */ - usb_refill_to_host(SIMTRACE_USB_EP_CARD_DATAIN); - /* ensure we can handle incoming USB messages from the host */ - /* currently we don't need any incoming data - usb_refill_from_host(SIMTRACE_USB_EP_CARD_DATAOUT); - struct llist_head *queue = usb_get_queue(SIMTRACE_USB_EP_CARD_DATAOUT); - process_any_usb_commands(queue); - */ + usb_process(&sniffer_usb_if); /* WARNING: the signal data and flags are not synchronized. We have to hope * the processing is fast enough to not land in the wrong state while data -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic6f9c6c1ffdbb0c9c3b284371ecc83b17e3be746 Gerrit-Change-Number: 16804 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 16:56:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jan 2020 16:56:23 +0000 Subject: Change in simtrace2[master]: WIP: firmware: sniffer: inbound USB handling References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16805 ) Change subject: WIP: firmware: sniffer: inbound USB handling ...................................................................... WIP: firmware: sniffer: inbound USB handling Change-Id: Ic953148600d82285281abcb573a07e2e9b8082a7 --- M firmware/libcommon/source/sniffer.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/05/16805/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 78413ec..7fd9961 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -977,8 +977,22 @@ /* handle incoming message from USB OUT EP */ static void dispatch_usb_out(struct msgb *msg, const struct usb_if *usb_if) { - /* currently we don't need any incoming data */ - msgb_free(msg); + struct simtrace_msg_hdr *sh = (Struct simtrace_msg_hdr *) msg->l1h; + + if (msg_length(msg) < sizeof(*sh)) { + usb_buf_free(msg); + return; + } + msg->l2h = msg->l1h + sizeof(*sh); + + switch (sh->msg_class) { + case SIMTRACE_MSGC_GENERIC: + break; + default: + break; + } + + usb_buf_free(msg); } static const struct usb_if sniffer_usb_if = { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic953148600d82285281abcb573a07e2e9b8082a7 Gerrit-Change-Number: 16805 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 17:38:22 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 17:38:22 +0000 Subject: Change in osmo-msc[master]: Use GSM411_RP_* and not GSM48_CC_* References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16806 ) Change subject: Use GSM411_RP_* and not GSM48_CC_* ...................................................................... Use GSM411_RP_* and not GSM48_CC_* d34ed5768cccab57e879bd32f38872d290c9ae89 introduced comparison of GSM411_RP_CAUSE_MO_NUM_UNASSIGNED with GSM48_CC_CAUSE_UNASSIGNED_NR For consistency lets use the GSM411_RP constants in SMS related code. Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 --- M src/libmsc/smpp_smsc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/16806/1 diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 3bfb81a..df3c847 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "smpp_smsc.h" @@ -327,9 +328,9 @@ *pesme = NULL; if (acl) - return GSM48_CC_CAUSE_NETWORK_OOO; + return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; else - return GSM48_CC_CAUSE_UNASSIGNED_NR; + return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 Gerrit-Change-Number: 16806 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 17:44:20 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 17:44:20 +0000 Subject: Change in osmo-bts[master]: L1SAP: remove verbose logging from rach_pass_filter() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: remove verbose logging from rach_pass_filter() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16800/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16800/1/src/common/l1sap.c at 1359 PS1, Line 1359: if (rach_ind->ber10k > bts->max_ber10k_rach) Is there any reason to maintain this logging, but at LOGL_DEBUG rather than LOGL_INFO? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 17:44:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 17:58:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 17:58:30 +0000 Subject: Change in osmo-bts[master]: L1SAP: remove verbose logging from rach_pass_filter() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: remove verbose logging from rach_pass_filter() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16800/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16800/1/src/common/l1sap.c at 1359 PS1, Line 1359: if (rach_ind->ber10k > bts->max_ber10k_rach) That was my initial idea, but Harald does not think it makes sense: > 15:10 < fixeria> whytek: "Ignoring an Access Burst ... ": AFAIR, we already have > a counter for that. Feel free to change the logging level, I would CR+2 ;) > 15:11 <@LaF0rge> fixeria: we can even remote it completely. If that part of the code > is "normally" hit multiple times a second anyway, there' sno point in logging it. Meanwhile, I just found his commit: https://git.osmocom.org/osmo-bts/commit/?id=e571fd60e628811416fca177bfad66ed628736a9 so keeping this logging at DEBUG may still be an option. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 17:58:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 18:09:03 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 18:09:03 +0000 Subject: Change in osmo-bts[master]: L1SAP: remove verbose logging from rach_pass_filter() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: remove verbose logging from rach_pass_filter() ...................................................................... Patch Set 1: > (1 comment) Given I triggered this on IRC (right?), I'd be happy if it were DEBUG. What about in a situation where you have "quiet" spectrum like in a lab and you are trying to track down RF issues with equipment? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jan 2020 18:09:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 21:17:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 21:17:49 +0000 Subject: Change in osmo-msc[master]: Use GSM411_RP_* and not GSM48_CC_* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16806 ) Change subject: Use GSM411_RP_* and not GSM48_CC_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 Gerrit-Change-Number: 16806 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 11 Jan 2020 21:17:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 21:42:23 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 11 Jan 2020 21:42:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 410 PS1, Line 410: is_eps > that would be wrong, IMHO. No. I just didn't know how to add a IE to an already created ts package. Is there a way how I can add an IE? I could also add 2nd template for EPS. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 11 Jan 2020 21:42:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:03:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 11 Jan 2020 22:03:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 to look at the new patch set (#2). Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... hlr: add TC_gsup_sai_num_auth_vectors TC_gsup_sai_num_auth_vectors tests the GSUP IE GSUP_IE_NUM_VECTORS_REQ which allows the client to ask for a specific amount of auth tuples in a Send Auth Info request. Change-Id: I10a523cbaf08fe42924ffd0dc498496fdc76395f --- M hlr/HLR_Tests.ttcn 1 file changed, 53 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/16790/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:04:16 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 11 Jan 2020 22:04:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 2: (2 comments) @fixeria Is there a way how I can add an IE? I could also add 2nd template for EPS. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 718 PS1, Line 718: num_auth_tuples > Unused variable? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790/1/hlr/HLR_Tests.ttcn at 795 PS1, Line 795: (auth_tuples != valueof(expected_auth_tuples) > You could just use match(expected_auth_tuples, auth_tuples) here? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 11 Jan 2020 22:04:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:22:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 22:22:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 2: Hi lynxis! > @fixeria Is there a way how I can add an IE? I could also add 2nd template for EPS. I would either make the existing templates more flexible by introducing a helper function (like f_gen_ts_ss_ies()), or do it like this: var template GSUP_PDU sai_msg; if (is_eps) { sai_msg := ts_GSUP_SAI_REQ_EPS(imsi); } else { sai_msg := ts_GSUP_SAI_REQ(imsi); } if (not istemplatekind(num_auth_tuple, "omit") { sai_msg.ies := sai_msg.ies & { valueof(ts_GSUP_IE_NUM_VECTORS_REQ(valueof(num_auth_tuple))) }; } GSUP.send(sai_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 11 Jan 2020 22:22:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jan 11 22:31:08 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jan 2020 22:31:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e1a4cc947d38_12e32ae013cea5f41314698@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 790s] server_init [ 790s] -client_init [ 790s] -client_query [ 790s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 790s] -server_recv [ 790s] -received request [ 790s] -server_recv [ 790s] -client_recv [ 790s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 790s] -Total time passed: 5.000000 s [ 790s] -server_stop [ 790s] -client_stop [ 790s] +osmo_mdns_sock_init: setsockopt: No such device [ 790s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 790s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 2414 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 790s] stdout: [ 790s] ./testsuite.at:64: exit code was 134, expected 0 [ 790s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 790s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 790s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 790s] make: *** [debian/rules:7: build] Error 2 [ 790s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 790s] [ 790s] lamb23 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sat Jan 11 22:31:00 UTC 2020. [ 790s] [ 790s] ### VM INTERACTION START ### [ 793s] [ 732.554646] sysrq: SysRq : Power Off [ 793s] [ 732.578386] reboot: Power down [ 793s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 22:40:01 +0000 Subject: Change in osmo-msc[master]: Use GSM411_RP_* and not GSM48_CC_* In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16806 ) Change subject: Use GSM411_RP_* and not GSM48_CC_* ...................................................................... Patch Set 1: Code-Review+2 Based on "Exceptions for Trivial" guidlines. I'll merge. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 Gerrit-Change-Number: 16806 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Sat, 11 Jan 2020 22:40:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:40:13 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 11 Jan 2020 22:40:13 +0000 Subject: Change in osmo-msc[master]: Use GSM411_RP_* and not GSM48_CC_* In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16806 ) Change subject: Use GSM411_RP_* and not GSM48_CC_* ...................................................................... Use GSM411_RP_* and not GSM48_CC_* d34ed5768cccab57e879bd32f38872d290c9ae89 introduced comparison of GSM411_RP_CAUSE_MO_NUM_UNASSIGNED with GSM48_CC_CAUSE_UNASSIGNED_NR For consistency lets use the GSM411_RP constants in SMS related code. Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 --- M src/libmsc/smpp_smsc.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved keith: Looks good to me, approved diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 3bfb81a..df3c847 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "smpp_smsc.h" @@ -327,9 +328,9 @@ *pesme = NULL; if (acl) - return GSM48_CC_CAUSE_NETWORK_OOO; + return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; else - return GSM48_CC_CAUSE_UNASSIGNED_NR; + return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie54966560f66d2dcde905feb2eb19ef90406acd1 Gerrit-Change-Number: 16806 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 22:49:25 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 11 Jan 2020 22:49:25 +0000 Subject: Change in osmo-hlr[master]: hlr: remove unused internal USSD list References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16807 ) Change subject: hlr: remove unused internal USSD list ...................................................................... hlr: remove unused internal USSD list struct hlr.iuse_list is not used at all. Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 --- M include/osmocom/hlr/hlr.h M src/hlr.c 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/07/16807/1 diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index 18c4a1d..0564518 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -46,7 +46,6 @@ struct llist_head euse_list; struct hlr_euse *euse_default; - struct llist_head iuse_list; /* NCSS (call independent) session guard timeout value */ int ncss_guard_timeout; diff --git a/src/hlr.c b/src/hlr.c index 38b9022..656f0a4 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -846,7 +846,6 @@ g_hlr = talloc_zero(hlr_ctx, struct hlr); INIT_LLIST_HEAD(&g_hlr->euse_list); - INIT_LLIST_HEAD(&g_hlr->iuse_list); INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); g_hlr->db_file_path = talloc_strdup(g_hlr, HLR_DEFAULT_DB_FILE_PATH); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 Gerrit-Change-Number: 16807 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 11 23:56:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jan 2020 23:56:25 +0000 Subject: Change in osmo-hlr[master]: hlr: remove unused internal USSD list In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16807 ) Change subject: hlr: remove unused internal USSD list ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 Gerrit-Change-Number: 16807 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 11 Jan 2020 23:56:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 12 01:51:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 01:51:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5e1a7bc685fcd_12e32ae013cea5f41344417@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 356s] | #define STDC_HEADERS 1 [ 356s] | #define HAVE_SYS_TYPES_H 1 [ 356s] | #define HAVE_SYS_STAT_H 1 [ 356s] | #define HAVE_STDLIB_H 1 [ 356s] | #define HAVE_STRING_H 1 [ 356s] | #define HAVE_MEMORY_H 1 [ 356s] | #define HAVE_STRINGS_H 1 [ 356s] | #define HAVE_INTTYPES_H 1 [ 356s] | #define HAVE_STDINT_H 1 [ 356s] | #define HAVE_UNISTD_H 1 [ 356s] | #define HAVE_DLFCN_H 1 [ 356s] | #define LT_OBJDIR ".libs/" [ 356s] | #define PACKAGE "osmo-hlr" [ 356s] | #define VERSION "1.2.0.4-637b" [ 356s] | #define STDC_HEADERS 1 [ 356s] | [ 356s] | configure: exit 0 [ 356s] [ 356s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 356s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 356s] make: *** [debian/rules:7: build] Error 2 [ 356s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 356s] [ 356s] obs-arm-9 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 01:51:35 UTC 2020. [ 356s] [ 356s] ### VM INTERACTION START ### [ 358s] [ 341.814846] sysrq: Power Off [ 358s] [ 341.819147] reboot: Power down [ 359s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:10:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:10:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5e1a8037a56c3_12e32ae013cea5f41347815@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 404s] | #define STDC_HEADERS 1 [ 404s] | #define HAVE_SYS_TYPES_H 1 [ 404s] | #define HAVE_SYS_STAT_H 1 [ 404s] | #define HAVE_STDLIB_H 1 [ 404s] | #define HAVE_STRING_H 1 [ 404s] | #define HAVE_MEMORY_H 1 [ 404s] | #define HAVE_STRINGS_H 1 [ 404s] | #define HAVE_INTTYPES_H 1 [ 404s] | #define HAVE_STDINT_H 1 [ 404s] | #define HAVE_UNISTD_H 1 [ 404s] | #define HAVE_DLFCN_H 1 [ 404s] | #define LT_OBJDIR ".libs/" [ 404s] | #define PACKAGE "osmo-hlr" [ 404s] | #define VERSION "1.2.0.4-637b" [ 404s] | #define STDC_HEADERS 1 [ 404s] | [ 404s] | configure: exit 0 [ 404s] [ 404s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 404s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 404s] make: *** [debian/rules:7: build] Error 2 [ 404s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 404s] [ 404s] lamb28 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:10:23 UTC 2020. [ 404s] [ 404s] ### VM INTERACTION START ### [ 407s] [ 387.857052] sysrq: SysRq : Power Off [ 407s] [ 387.863218] reboot: Power down [ 407s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:11:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:11:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5e1a80768a75c_12e32ae013cea5f41348341@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 326s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 326s] -server_recv [ 326s] -received request [ 326s] -server_recv [ 326s] -client_recv [ 326s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 326s] -Total time passed: 5.000000 s [ 326s] -server_stop [ 326s] -client_stop [ 326s] +osmo_mdns_sock_init: setsockopt: No such device [ 326s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 326s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 1315 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 326s] stdout: [ 326s] backtrace() returned 1 addresses [ 326s] ./testsuite.at:64: exit code was 134, expected 0 [ 326s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 326s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 326s] make[1]: *** [override_dh_auto_test] Error 1 [ 326s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 326s] debian/rules:7: recipe for target 'build' failed [ 326s] make: *** [build] Error 2 [ 326s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 326s] [ 326s] obs-arm-7 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:11:38 UTC 2020. [ 326s] [ 326s] ### VM INTERACTION START ### [ 328s] [ 315.177621] sysrq: Power Off [ 328s] [ 315.181855] reboot: Power down [ 328s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:12:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:12:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5e1a80b2acc32_12e32ae013cea5f41348412@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 466s] -client_recv [ 466s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 466s] -Total time passed: 5.000000 s [ 466s] -server_stop [ 466s] -client_stop [ 466s] +osmo_mdns_sock_init: setsockopt: No such device [ 466s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 466s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 1250 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 466s] stdout: [ 466s] backtrace() returned 5 addresses [ 466s] /usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf76490fc] [ 466s] /usr/src/packages/BUILD/tests/mslookup/mslookup_client_mdns_test(main+0x4e9) [0x56577399] [ 466s] /lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf6) [0xf7473286] [ 466s] /usr/src/packages/BUILD/tests/mslookup/mslookup_client_mdns_test(+0x1475) [0x56577475] [ 466s] ./testsuite.at:64: exit code was 134, expected 0 [ 466s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 466s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 466s] make[1]: *** [override_dh_auto_test] Error 1 [ 466s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 466s] debian/rules:7: recipe for target 'build' failed [ 466s] make: *** [build] Error 2 [ 466s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 466s] [ 466s] lamb25 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:12:35 UTC 2020. [ 466s] [ 466s] ### VM INTERACTION START ### [ 469s] [ 437.939028] sysrq: SysRq : Power Off [ 469s] [ 437.955632] reboot: Power down [ 469s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:16:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:16:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5e1a819e337d5_12e32ae013cea5f413493b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 375s] server_init [ 375s] -client_init [ 375s] -client_query [ 375s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 375s] -server_recv [ 375s] -received request [ 375s] -server_recv [ 375s] -client_recv [ 375s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 375s] -Total time passed: 5.000000 s [ 375s] -server_stop [ 375s] -client_stop [ 375s] +osmo_mdns_sock_init: setsockopt: No such device [ 375s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 375s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 2635 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 375s] stdout: [ 375s] ./testsuite.at:64: exit code was 134, expected 0 [ 375s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 375s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 375s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 375s] make: *** [debian/rules:7: build] Error 2 [ 375s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 375s] [ 375s] lamb12 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:16:30 UTC 2020. [ 375s] [ 375s] ### VM INTERACTION START ### [ 378s] [ 360.126853] sysrq: SysRq : Power Off [ 378s] [ 360.132627] reboot: Power down [ 378s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:27:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:27:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5e1a84193f144_12e32ae013cea5f41351058@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 901s] | #define STDC_HEADERS 1 [ 901s] | #define HAVE_SYS_TYPES_H 1 [ 901s] | #define HAVE_SYS_STAT_H 1 [ 901s] | #define HAVE_STDLIB_H 1 [ 901s] | #define HAVE_STRING_H 1 [ 901s] | #define HAVE_MEMORY_H 1 [ 901s] | #define HAVE_STRINGS_H 1 [ 901s] | #define HAVE_INTTYPES_H 1 [ 901s] | #define HAVE_STDINT_H 1 [ 901s] | #define HAVE_UNISTD_H 1 [ 901s] | #define HAVE_DLFCN_H 1 [ 901s] | #define LT_OBJDIR ".libs/" [ 901s] | #define PACKAGE "osmo-hlr" [ 901s] | #define VERSION "1.2.0.4-637b" [ 901s] | #define STDC_HEADERS 1 [ 901s] | [ 901s] | configure: exit 0 [ 901s] [ 901s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 901s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 901s] make: *** [debian/rules:7: build] Error 2 [ 901s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 901s] [ 901s] lamb24 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:27:16 UTC 2020. [ 901s] [ 901s] ### VM INTERACTION START ### [ 904s] [ 880.078791] sysrq: SysRq : Power Off [ 904s] [ 880.096163] reboot: Power down [ 904s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:31:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:31:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5e1a8507b8aa3_12e32ae013cea5f413517ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 420s] | #define HAVE_SYS_STAT_H 1 [ 420s] | #define HAVE_STDLIB_H 1 [ 420s] | #define HAVE_STRING_H 1 [ 420s] | #define HAVE_MEMORY_H 1 [ 420s] | #define HAVE_STRINGS_H 1 [ 420s] | #define HAVE_INTTYPES_H 1 [ 420s] | #define HAVE_STDINT_H 1 [ 420s] | #define HAVE_UNISTD_H 1 [ 420s] | #define HAVE_DLFCN_H 1 [ 420s] | #define LT_OBJDIR ".libs/" [ 420s] | #define PACKAGE "osmo-hlr" [ 420s] | #define VERSION "1.2.0.4-637b" [ 420s] | #define STDC_HEADERS 1 [ 420s] | [ 420s] | configure: exit 0 [ 420s] [ 420s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 420s] make[1]: *** [override_dh_auto_test] Error 1 [ 420s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 420s] debian/rules:7: recipe for target 'build' failed [ 420s] make: *** [build] Error 2 [ 420s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 420s] [ 420s] lamb56 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:31:19 UTC 2020. [ 420s] [ 420s] ### VM INTERACTION START ### [ 422s] [ 406.324342] sysrq: SysRq : Power Off [ 422s] [ 406.331651] reboot: Power down [ 422s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:32:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:32:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5e1a854191dbd_12e32ae013cea5f413519ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 734s] -client_query [ 734s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 734s] -server_recv [ 734s] -received request [ 734s] -server_recv [ 734s] -client_recv [ 734s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 734s] -Total time passed: 5.000000 s [ 734s] -server_stop [ 734s] -client_stop [ 734s] +osmo_mdns_sock_init: setsockopt: No such device [ 734s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 734s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 4910 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 734s] stdout: [ 734s] ./testsuite.at:64: exit code was 134, expected 0 [ 734s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 734s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 734s] make[1]: *** [override_dh_auto_test] Error 1 [ 734s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 734s] debian/rules:7: recipe for target 'build' failed [ 734s] make: *** [build] Error 2 [ 734s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 734s] [ 734s] lamb61 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:32:01 UTC 2020. [ 734s] [ 734s] ### VM INTERACTION START ### [ 738s] [ 709.806522] sysrq: SysRq : Power Off [ 738s] [ 709.812161] reboot: Power down [ 738s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:35:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:35:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5e1a861586fae_12e32ae013cea5f413528bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 480s] -client_recv [ 480s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 480s] -Total time passed: 5.000000 s [ 480s] -server_stop [ 480s] -client_stop [ 480s] +osmo_mdns_sock_init: setsockopt: No such device [ 480s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 480s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 25: 1511 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 480s] stdout: [ 480s] backtrace() returned 5 addresses [ 480s] /usr/lib/x86_64-linux-gnu/libosmocore.so.12(osmo_panic+0xcb) [0x7f5096d23adb] [ 480s] /usr/src/packages/BUILD/tests/mslookup/mslookup_client_mdns_test(+0x191c) [0x56364ac0b91c] [ 480s] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf1) [0x7f509676b2e1] [ 480s] /usr/src/packages/BUILD/tests/mslookup/mslookup_client_mdns_test(+0x1a1a) [0x56364ac0ba1a] [ 480s] ./testsuite.at:64: exit code was 134, expected 0 [ 480s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 480s] debian/rules:17: recipe for target 'override_dh_auto_test' failed [ 480s] make[1]: *** [override_dh_auto_test] Error 1 [ 480s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 480s] debian/rules:7: recipe for target 'build' failed [ 480s] make: *** [build] Error 2 [ 480s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 480s] [ 480s] lamb08 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:35:28 UTC 2020. [ 480s] [ 480s] ### VM INTERACTION START ### [ 484s] [ 455.395776] sysrq: SysRq : Power Off [ 484s] [ 455.451207] reboot: Power down [ 484s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:37:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:37:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5e1a866e8935b_12e32ae013cea5f413533d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 501s] | #define STDC_HEADERS 1 [ 501s] | #define HAVE_SYS_TYPES_H 1 [ 501s] | #define HAVE_SYS_STAT_H 1 [ 501s] | #define HAVE_STDLIB_H 1 [ 501s] | #define HAVE_STRING_H 1 [ 501s] | #define HAVE_MEMORY_H 1 [ 501s] | #define HAVE_STRINGS_H 1 [ 501s] | #define HAVE_INTTYPES_H 1 [ 501s] | #define HAVE_STDINT_H 1 [ 501s] | #define HAVE_UNISTD_H 1 [ 501s] | #define HAVE_DLFCN_H 1 [ 501s] | #define LT_OBJDIR ".libs/" [ 501s] | #define PACKAGE "osmo-hlr" [ 501s] | #define VERSION "1.2.0.4-637b" [ 501s] | #define STDC_HEADERS 1 [ 501s] | [ 501s] | configure: exit 0 [ 501s] [ 501s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 501s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 501s] make: *** [debian/rules:7: build] Error 2 [ 501s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 501s] [ 501s] lamb16 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:37:16 UTC 2020. [ 501s] [ 501s] ### VM INTERACTION START ### [ 504s] [ 481.163013] sysrq: SysRq : Power Off [ 504s] [ 481.168769] reboot: Power down [ 504s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:44:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:44:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5e1a87f5cbcf2_12e32ae013cea5f41354536@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 372s] | #define STDC_HEADERS 1 [ 372s] | #define HAVE_SYS_TYPES_H 1 [ 372s] | #define HAVE_SYS_STAT_H 1 [ 372s] | #define HAVE_STDLIB_H 1 [ 372s] | #define HAVE_STRING_H 1 [ 372s] | #define HAVE_MEMORY_H 1 [ 372s] | #define HAVE_STRINGS_H 1 [ 372s] | #define HAVE_INTTYPES_H 1 [ 372s] | #define HAVE_STDINT_H 1 [ 372s] | #define HAVE_UNISTD_H 1 [ 372s] | #define HAVE_DLFCN_H 1 [ 372s] | #define LT_OBJDIR ".libs/" [ 372s] | #define PACKAGE "osmo-hlr" [ 372s] | #define VERSION "1.2.0.4-637b" [ 372s] | #define STDC_HEADERS 1 [ 372s] | [ 372s] | configure: exit 0 [ 372s] [ 372s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 372s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 372s] make: *** [debian/rules:7: build] Error 2 [ 372s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 372s] [ 372s] lamb23 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:43:46 UTC 2020. [ 372s] [ 372s] ### VM INTERACTION START ### [ 376s] [ 359.641494] sysrq: SysRq : Power Off [ 376s] [ 359.647980] reboot: Power down [ 376s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 02:47:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 02:47:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1a88c95b23f_12e32ae013cea5f41355361@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 554s] | #define STDC_HEADERS 1 [ 554s] | #define HAVE_SYS_TYPES_H 1 [ 554s] | #define HAVE_SYS_STAT_H 1 [ 554s] | #define HAVE_STDLIB_H 1 [ 554s] | #define HAVE_STRING_H 1 [ 554s] | #define HAVE_MEMORY_H 1 [ 554s] | #define HAVE_STRINGS_H 1 [ 554s] | #define HAVE_INTTYPES_H 1 [ 554s] | #define HAVE_STDINT_H 1 [ 554s] | #define HAVE_UNISTD_H 1 [ 554s] | #define HAVE_DLFCN_H 1 [ 554s] | #define LT_OBJDIR ".libs/" [ 554s] | #define PACKAGE "osmo-hlr" [ 554s] | #define VERSION "1.2.0.4-637b" [ 554s] | #define STDC_HEADERS 1 [ 554s] | [ 554s] | configure: exit 0 [ 554s] [ 554s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 554s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 554s] make: *** [debian/rules:7: build] Error 2 [ 554s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 554s] [ 554s] lamb26 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:47:19 UTC 2020. [ 554s] [ 554s] ### VM INTERACTION START ### [ 557s] [ 529.117371] sysrq: SysRq : Power Off [ 557s] [ 529.129806] reboot: Power down [ 557s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 03:00:03 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 03:00:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5e1a8bd44bd55_12e32ae013cea5f4135664b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 391s] server_init [ 391s] -client_init [ 391s] -client_query [ 391s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 391s] -server_recv [ 391s] -received request [ 391s] -server_recv [ 391s] -client_recv [ 391s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 391s] -Total time passed: 5.000000 s [ 391s] -server_stop [ 391s] -client_stop [ 391s] +osmo_mdns_sock_init: setsockopt: No such device [ 391s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 391s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 1448 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 391s] stdout: [ 391s] ./testsuite.at:64: exit code was 134, expected 0 [ 391s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 391s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 391s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 391s] make: *** [debian/rules:7: build] Error 2 [ 391s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 391s] [ 391s] lamb12 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 02:59:57 UTC 2020. [ 391s] [ 391s] ### VM INTERACTION START ### [ 394s] [ 371.108806] sysrq: SysRq : Power Off [ 394s] [ 371.113581] reboot: Power down [ 394s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 03:12:36 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 03:12:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e1a8ec3e284e_12e32ae013cea5f413585a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 574s] | #define STDC_HEADERS 1 [ 574s] | #define HAVE_SYS_TYPES_H 1 [ 574s] | #define HAVE_SYS_STAT_H 1 [ 574s] | #define HAVE_STDLIB_H 1 [ 574s] | #define HAVE_STRING_H 1 [ 574s] | #define HAVE_MEMORY_H 1 [ 574s] | #define HAVE_STRINGS_H 1 [ 574s] | #define HAVE_INTTYPES_H 1 [ 574s] | #define HAVE_STDINT_H 1 [ 574s] | #define HAVE_UNISTD_H 1 [ 574s] | #define HAVE_DLFCN_H 1 [ 574s] | #define LT_OBJDIR ".libs/" [ 574s] | #define PACKAGE "osmo-hlr" [ 574s] | #define VERSION "1.2.0.4-637b" [ 574s] | #define STDC_HEADERS 1 [ 574s] | [ 574s] | configure: exit 0 [ 574s] [ 574s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 574s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 574s] make: *** [debian/rules:7: build] Error 2 [ 574s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 574s] [ 574s] lamb28 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 03:12:18 UTC 2020. [ 574s] [ 574s] ### VM INTERACTION START ### [ 577s] [ 552.172367] sysrq: SysRq : Power Off [ 577s] [ 552.196436] reboot: Power down [ 577s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 03:26:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 03:26:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5e1a91e944f13_12e32ae013cea5f4136175b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 722s] | | #define PACKAGE_VERSION "1.2.0.4-637b" [ 722s] | | #define PACKAGE_STRING "osmo-hlr 1.2.0.4-637b" [ 722s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 722s] | | #define PACKAGE_URL "" [ 722s] | | /* end confdefs.h. */ [ 722s] | | #include [ 722s] | configure:6797: checking for ANSI C header files [ 722s] | configure:6817: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 722s] | configure:6817: $? = 0 [ 722s] | configure:6890: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now conftest.c >&5 [ 722s] | configure:6890: $? = 0 [ 722s] | configure:6890: ./conftest [ 722s] | configure:6890: $? = 0 [ 722s] | configure:6901: result: yes [ 722s] | configure:6914: checking for sys/types.h [ 722s] | configure:6914: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 722s] | configure:6914: $? = 0 [ 722s] | configure:6914: result: yes [ 722s] | configure:6914: checking for sys/stat.h [ 722s] | configure:6914: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 722s] | configure:6914: $? = 0 [ 722s] | configure:6914: result: yes [ 722s] | configure:6914: checking for stdlib.h [ 722s] | configure:6914: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 722s] | configure:6914: $? = 0 [ 722s] | configure:6914: result: yes [ 724s] |[ 697.535048] sysrq: SysRq : Power Off [ 724s] [ 697.542352] reboot: Power down [ 724s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 03:27:44 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 03:27:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/armv7l In-Reply-To: References: Message-ID: <5e1a9244ccd4f_12e32ae013cea5f413620bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 802s] | #define STDC_HEADERS 1 [ 802s] | #define HAVE_SYS_TYPES_H 1 [ 802s] | #define HAVE_SYS_STAT_H 1 [ 802s] | #define HAVE_STDLIB_H 1 [ 802s] | #define HAVE_STRING_H 1 [ 802s] | #define HAVE_MEMORY_H 1 [ 802s] | #define HAVE_STRINGS_H 1 [ 802s] | #define HAVE_INTTYPES_H 1 [ 802s] | #define HAVE_STDINT_H 1 [ 802s] | #define HAVE_UNISTD_H 1 [ 802s] | #define HAVE_DLFCN_H 1 [ 802s] | #define LT_OBJDIR ".libs/" [ 802s] | #define PACKAGE "osmo-hlr" [ 802s] | #define VERSION "1.2.0.4-637b" [ 802s] | #define STDC_HEADERS 1 [ 802s] | [ 802s] | configure: exit 0 [ 802s] [ 802s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 802s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 802s] make: *** [debian/rules:7: build] Error 2 [ 802s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 802s] [ 802s] obs-arm-5 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 03:27:32 UTC 2020. [ 802s] [ 802s] ### VM INTERACTION START ### [ 805s] [ 762.429650] sysrq: SysRq : Power Off [ 805s] [ 762.437396] reboot: Power down [ 806s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 03:51:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 03:51:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e1a97c7abb49_12e32ae013cea5f413648e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1066s] server_init [ 1066s] -client_init [ 1066s] -client_query [ 1066s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 1066s] -server_recv [ 1066s] -received request [ 1066s] -server_recv [ 1066s] -client_recv [ 1066s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 1066s] -Total time passed: 5.000000 s [ 1066s] -server_stop [ 1066s] -client_stop [ 1066s] +osmo_mdns_sock_init: setsockopt: No such device [ 1066s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 1066s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 1922 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 1066s] stdout: [ 1066s] ./testsuite.at:64: exit code was 134, expected 0 [ 1066s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 1066s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 1066s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1066s] make: *** [debian/rules:7: build] Error 2 [ 1067s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1067s] [ 1067s] obs-arm-6 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 03:51:17 UTC 2020. [ 1067s] [ 1067s] ### VM INTERACTION START ### [ 1069s] [ 986.874313] sysrq: SysRq : Power Off [ 1069s] [ 986.888540] reboot: Power down [ 1070s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 12 04:30:55 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 04:30:55 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Add vty `imsi unknown cause` to set the reject cause Allow to set the reject cause when an IMSI is unknown to the HLR. Most common on reject causes are GMM_CAUSE_IMSI_UNKNOWN (2) or CAUSE_ROAMING_NOTALLOWED (11). Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a --- M doc/examples/osmo-hlr.cfg M include/osmocom/hlr/hlr.h M src/hlr.c M src/hlr_vty.c 4 files changed, 33 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/08/16808/1 diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg index a685858..cf78e74 100644 --- a/doc/examples/osmo-hlr.cfg +++ b/doc/examples/osmo-hlr.cfg @@ -24,3 +24,4 @@ bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi + imsi unknown cause 2 diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index 0564518..ae3ce39 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -23,6 +23,7 @@ #pragma once #include +#include #include #define HLR_DEFAULT_DB_FILE_PATH "hlr.db" @@ -46,6 +47,7 @@ struct llist_head euse_list; struct hlr_euse *euse_default; + enum gsm48_gmm_cause imsi_unknown_cause; /* NCSS (call independent) session guard timeout value */ int ncss_guard_timeout; diff --git a/src/hlr.c b/src/hlr.c index 656f0a4..966267b 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -268,7 +268,7 @@ break; case -ENOENT: LOGP(DAUC, LOGL_NOTICE, "%s: IMSI not known\n", gsup->imsi); - gsup_out.cause = GMM_CAUSE_IMSI_UNKNOWN; + gsup_out.cause = g_hlr->imsi_unknown_cause; break; default: LOGP(DAUC, LOGL_ERROR, "%s: failure to look up IMSI in db\n", gsup->imsi); @@ -849,6 +849,7 @@ INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); g_hlr->db_file_path = talloc_strdup(g_hlr, HLR_DEFAULT_DB_FILE_PATH); + g_hlr->imsi_unknown_cause = GMM_CAUSE_IMSI_UNKNOWN; /* Init default (call independent) SS session guard timeout value */ g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 6701cd9..9b1dac3 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -25,7 +25,10 @@ * */ +#include + #include +#include #include #include #include @@ -73,6 +76,7 @@ static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); + vty_out(vty, " imsi unknown cause %d%s", g_hlr->imsi_unknown_cause, VTY_NEWLINE); if (g_hlr->store_imei) vty_out(vty, " store-imei%s", VTY_NEWLINE); if (g_hlr->db_file_path && strcmp(g_hlr->db_file_path, HLR_DEFAULT_DB_FILE_PATH)) @@ -337,6 +341,29 @@ return CMD_SUCCESS; } +DEFUN(cfg_imsi_not_found_cause, cfg_imsi_not_found_cause_cmd, + "imsi unknown cause CAUSE", + "Define the GSUP cause to be send in case the IMSI could not found in the database." + "Default is 2 (GMM_CAUSE_IMSI_UNKNOWN). A good alternative is 13 (GMM_CAUSE_ROAMING_NOTALLOWED)." + ) +{ + long int cause = 0; + char *endptr = NULL; + + errno = 0; + cause = strtol(argv[0], &endptr, 0); + if (errno) + return -errno; + else if (*endptr) + return -EINVAL; + + if (get_value_string_or_null(gsm48_gmm_cause_names, (uint32_t) cause) == NULL) + return -EINVAL; + + g_hlr->imsi_unknown_cause = (enum gsm48_gmm_cause) cause; + return CMD_SUCCESS; +} + DEFUN(cfg_store_imei, cfg_store_imei_cmd, "store-imei", "Save the IMEI in the database when receiving Check IMEI requests. Note that an MSC does not necessarily send" @@ -460,6 +487,7 @@ install_element(HLR_NODE, &cfg_no_store_imei_cmd); install_element(HLR_NODE, &cfg_subscr_create_on_demand_cmd); install_element(HLR_NODE, &cfg_no_subscr_create_on_demand_cmd); + install_element(HLR_NODE, &cfg_imsi_not_found_cause_cmd); hlr_vty_subscriber_init(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 04:44:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 04:44:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add test TC_gsup_sai_err_unknown_imsi_configurable References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16809 ) Change subject: hlr: add test TC_gsup_sai_err_unknown_imsi_configurable ...................................................................... hlr: add test TC_gsup_sai_err_unknown_imsi_configurable Test `vty imsi unknown cause` to change the reject cause Change-Id: I1d3fa75c100f9d026ece8314bb7a70e905f1a3ef --- M hlr/HLR_Tests.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/16809/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 50109a6..c0df1f9 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -694,6 +694,22 @@ vc_conn.done; } +private function f_TC_gsup_sai_err_unknown_imsi_configurable() runs on HLR_ConnHdlr { + var GSUP_PDU res; + f_vty_config(VTY, "hlr", "imsi unknown cause 5"); + res := f_perform_SAI(g_pars.sub.imsi, 5); + f_vty_config(VTY, "hlr", "imsi unknown cause 2"); + setverdict(pass); +} + +testcase TC_gsup_sai_err_unknown_imsi_configurable() runs on test_CT { + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(f_rnd_imsi('26242'H))); + f_init(false); + vc_conn := f_start_handler(refers(f_TC_gsup_sai_err_unknown_imsi_configurable), pars); + vc_conn.done; +} + function f_start_handler_per_sub(void_fn fn, HlrSubscriberList sl) runs on test_CT { for (var integer i := 0; i < sizeof(sl); i := i+1) { var HlrSubscriber sub := sl[i]; @@ -1474,6 +1490,7 @@ execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); + execute( TC_gsup_sai_err_unknown_imsi_configurable() ); execute( TC_gsup_ul() ); execute( TC_vty() ); execute( TC_vty_msisdn_isd() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16809 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: I1d3fa75c100f9d026ece8314bb7a70e905f1a3ef Gerrit-Change-Number: 16809 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 04:51:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 04:51:28 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 to look at the new patch set (#2). Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Add vty `imsi unknown cause` to set the reject cause Allow to set the reject cause when an IMSI is unknown to the HLR. Most common on reject causes are GMM_CAUSE_IMSI_UNKNOWN (2) or CAUSE_ROAMING_NOTALLOWED (11). Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a --- M doc/examples/osmo-hlr.cfg M include/osmocom/hlr/hlr.h M src/hlr.c M src/hlr_vty.c M tests/test_nodes.vty 5 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/08/16808/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:04:52 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:04:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 to look at the new patch set (#3). Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... hlr: add TC_gsup_sai_num_auth_vectors TC_gsup_sai_num_auth_vectors tests the GSUP IE GSUP_IE_NUM_VECTORS_REQ which allows the client to ask for a specific amount of auth tuples in a Send Auth Info request. Change-Id: I10a523cbaf08fe42924ffd0dc498496fdc76395f --- M hlr/HLR_Tests.ttcn 1 file changed, 61 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/16790/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:05:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:05:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 3: > Patch Set 2: > > Hi lynxis! > > > @fixeria Is there a way how I can add an IE? I could also add 2nd template for EPS. > > I would either make the existing templates more flexible by introducing a helper function (like f_gen_ts_ss_ies()), or do it like this: > > var template GSUP_PDU sai_msg; > > if (is_eps) { > sai_msg := ts_GSUP_SAI_REQ_EPS(imsi); > } else { > sai_msg := ts_GSUP_SAI_REQ(imsi); > } > > if (not istemplatekind(num_auth_tuple, "omit") { > sai_msg.ies := sai_msg.ies & { valueof(ts_GSUP_IE_NUM_VECTORS_REQ(valueof(num_auth_tuple))) }; > } > > GSUP.send(sai_msg); Thanks a lot! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 12 Jan 2020 05:05:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:25:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:25:49 +0000 Subject: Change in osmo-iuh[master]: Add vty disconnect to disconnect a single HNB References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16810 ) Change subject: Add vty disconnect to disconnect a single HNB ...................................................................... Add vty disconnect to disconnect a single HNB Allow the operator to disconnect a specific HNB from the gateway. Change-Id: Ia0b3d6e15202fdbc3a56bd4fce9c42209bb0cff1 --- M include/osmocom/iuh/hnbgw.h M include/osmocom/iuh/hnbgw_hnbap.h M src/hnbgw.c M src/hnbgw_hnbap.c M src/hnbgw_vty.c 5 files changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/10/16810/1 diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h index 4848c2f..807f11a 100644 --- a/include/osmocom/iuh/hnbgw.h +++ b/include/osmocom/iuh/hnbgw.h @@ -164,5 +164,8 @@ struct hnb_context *hnb_context_alloc(struct hnb_gw *gw, struct osmo_stream_srv_link *link, int new_fd); void hnb_context_release(struct hnb_context *ctx); +/*! Send a HNB disconnect to the hnb and free all resources */ +void hnb_context_disconnect(struct hnb_context *ctx); + void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx); int hnbgw_vty_go_parent(struct vty *vty); diff --git a/include/osmocom/iuh/hnbgw_hnbap.h b/include/osmocom/iuh/hnbgw_hnbap.h index cca3550..d6bccc4 100644 --- a/include/osmocom/iuh/hnbgw_hnbap.h +++ b/include/osmocom/iuh/hnbgw_hnbap.h @@ -2,5 +2,6 @@ #include +int hnbgw_tx_hnb_deregister(struct hnb_context *ctx); int hnbgw_hnbap_rx(struct hnb_context *hnb, struct msgb *msg); int hnbgw_hnbap_init(void); diff --git a/src/hnbgw.c b/src/hnbgw.c index 70ee25b..05a8617 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -297,6 +297,15 @@ return ctx; } +void hnb_context_disconnect(struct hnb_context *ctx) +{ + hnbgw_tx_hnb_deregister(ctx); + /* TODO: use a timeout/callback on the hnb_context_relase if the HNB + * does not react. If we release the context right a way, + * the disconnect message is never sent. + hnb_context_release(ctx); */ +} + void hnb_context_release(struct hnb_context *ctx) { struct hnbgw_context_map *map, *map2; diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index 2d67219..910a151 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -124,6 +124,35 @@ return hnbgw_hnbap_tx(ctx, msg); } +int hnbgw_tx_hnb_deregister(struct hnb_context *ctx) +{ + HNBDe_Register_t *deregister_out; + struct msgb *msg; + int rc; + HNBDe_RegisterIEs_t deregister = {}; + + deregister.cause.present = Cause_PR_radioNetwork; + deregister.cause.choice.misc= CauseMisc_o_and_m_intervention; + + memset(&deregister_out, 0, sizeof(deregister_out)); + rc = hnbap_encode_hnbde_registeries(&deregister_out, &deregister); + if (rc < 0) { + LOGP(DHNBAP, LOGL_ERROR, "Failure to encode HNB-DE-REGISTER to %s: rc=%d\n", + ctx->identity_info, rc); + return rc; + } + + /* encode pdu */ + msg = hnbap_generate_initiating_message(ProcedureCode_id_HNBDe_Register, + Criticality_ignore, + &asn_DEF_HNBDe_Register, + &deregister_out); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBDe_Register, &deregister_out); + + return hnbgw_hnbap_tx(ctx, msg); +} + static int hnbgw_tx_ue_register_acc(struct ue_context *ue) { diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c index 84a5f01..60bcf90 100644 --- a/src/hnbgw_vty.c +++ b/src/hnbgw_vty.c @@ -31,6 +31,8 @@ #include #include +#include + static void *tall_hnb_ctx = NULL; static struct hnb_gw *g_hnb_gw = NULL; @@ -260,6 +262,29 @@ return CMD_SUCCESS; } +DEFUN(hnb_disconnect_by_name, hnb_disconnect_by_name_cmd, "hnb by-name NAME disconnect", + "HNB Specific Commands\n" + "Disconnect the HNB. The HNB can reconnect afterwards.") +{ + struct hnb_context *hnb; + const char *identity_info = argv[0]; + + if (llist_empty(&g_hnb_gw->hnb_list)) { + vty_out(vty, "No HNB connected%s", VTY_NEWLINE); + return CMD_ERR_NO_MATCH; + } + + hnb = hnb_context_by_identity_info(g_hnb_gw, identity_info); + if (hnb == NULL) { + vty_out(vty, "No HNB found with identity '%s'%s", identity_info, VTY_NEWLINE); + return CMD_ERR_NO_MATCH; + } + + hnb_context_disconnect(hnb); + + return CMD_SUCCESS; +} + DEFUN(cfg_hnbgw_rnc_id, cfg_hnbgw_rnc_id_cmd, "rnc-id <0-65535>", "Configure the HNBGW's RNC Id, the common RNC Id used for all connected hNodeB. It is sent to" @@ -401,4 +426,6 @@ install_element_ve(&show_one_hnb_cmd); install_element_ve(&show_ue_cmd); install_element_ve(&show_talloc_cmd); + + install_element(ENABLE_NODE, &hnb_disconnect_by_name_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia0b3d6e15202fdbc3a56bd4fce9c42209bb0cff1 Gerrit-Change-Number: 16810 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:27:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:27:05 +0000 Subject: Change in osmo-iuh[master]: Add vty `disconnect` a single HNB In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-iuh/+/16810 ) Change subject: Add vty `disconnect` a single HNB ...................................................................... Add vty `disconnect` a single HNB Allow the operator to disconnect a specific HNB from the gateway. Change-Id: Ia0b3d6e15202fdbc3a56bd4fce9c42209bb0cff1 --- M include/osmocom/iuh/hnbgw.h M include/osmocom/iuh/hnbgw_hnbap.h M src/hnbgw.c M src/hnbgw_hnbap.c M src/hnbgw_vty.c 5 files changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/10/16810/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia0b3d6e15202fdbc3a56bd4fce9c42209bb0cff1 Gerrit-Change-Number: 16810 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:44:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:44:45 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... Patch Set 1: It's https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 05:44:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 05:50:16 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 12 Jan 2020 05:50:16 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... Patch Set 1: Code-Review+2 The code there is wrong, because `mmctx->ran_type == MM_CTX_T_GERAN_Gb` is true, even when this function is called from Iu. However as you sad, this fixes the crash so +2. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 05:50:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 12 08:51:24 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 08:51:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1ade1d948d9_12e32ae013cea5f41446629@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1101s] server_init [ 1101s] -client_init [ 1101s] -client_query [ 1101s] -sending mDNS query: gsup.hlr.123456789012345.imsi [ 1101s] -server_recv [ 1101s] -received request [ 1101s] -server_recv [ 1101s] -client_recv [ 1101s] -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) [ 1101s] -Total time passed: 5.000000 s [ 1101s] -server_stop [ 1101s] -client_stop [ 1101s] +osmo_mdns_sock_init: setsockopt: No such device [ 1101s] +Assert failed server_mc mslookup_client_mdns_test.c:86 [ 1101s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/9/test-source: line 14: 2593 Aborted $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test [ 1101s] stdout: [ 1101s] ./testsuite.at:64: exit code was 134, expected 0 [ 1101s] 9. testsuite.at:61: 9. mslookup_client_mdns (testsuite.at:61): FAILED (testsuite.at:64) [ 1101s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 1101s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1101s] make: *** [debian/rules:7: build] Error 2 [ 1101s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1101s] [ 1101s] lamb24 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 08:51:17 UTC 2020. [ 1101s] [ 1101s] ### VM INTERACTION START ### [ 1104s] [ 1023.331251] sysrq: SysRq : Power Off [ 1104s] [ 1023.338463] reboot: Power down [ 1104s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 12 10:19:07 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 10:19:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e1af29e54cdc_12e32ae013cea5f4145632f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 383s] | #define STDC_HEADERS 1 [ 383s] | #define HAVE_SYS_TYPES_H 1 [ 383s] | #define HAVE_SYS_STAT_H 1 [ 383s] | #define HAVE_STDLIB_H 1 [ 383s] | #define HAVE_STRING_H 1 [ 383s] | #define HAVE_MEMORY_H 1 [ 383s] | #define HAVE_STRINGS_H 1 [ 383s] | #define HAVE_INTTYPES_H 1 [ 383s] | #define HAVE_STDINT_H 1 [ 383s] | #define HAVE_UNISTD_H 1 [ 383s] | #define HAVE_DLFCN_H 1 [ 383s] | #define LT_OBJDIR ".libs/" [ 383s] | #define PACKAGE "osmo-hlr" [ 383s] | #define VERSION "1.2.0.4-637b" [ 383s] | #define STDC_HEADERS 1 [ 383s] | [ 383s] | configure: exit 0 [ 383s] [ 383s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 383s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make: *** [debian/rules:7: build] Error 2 [ 383s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 383s] [ 383s] lamb09 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 10:19:01 UTC 2020. [ 383s] [ 383s] ### VM INTERACTION START ### [ 386s] [ 368.693218] sysrq: SysRq : Power Off [ 386s] [ 368.700283] reboot: Power down [ 386s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:38:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:38:40 +0000 Subject: Change in osmo-iuh[master]: RANAB: always allow GSM handover In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15470 ) Change subject: RANAB: always allow GSM handover ...................................................................... Patch Set 2: test suite wasn't updated accordingly, and it's RANAP with P, not B. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I537744eba7608c2fc173c766d4fd43e53e99a116 Gerrit-Change-Number: 15470 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 10:38:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:39:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:39:10 +0000 Subject: Change in osmo-hlr[master]: hlr: remove unused internal USSD list In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16807 ) Change subject: hlr: remove unused internal USSD list ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 Gerrit-Change-Number: 16807 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 12 Jan 2020 10:39:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:40:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:40:50 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: I would prefer if this was some kind of textual (human readable) parameter in the VTY. GSM/UMTS are complex enough as-is, we don't need to make it more complicated for people to write or read a config file by forcing the mto look up tables in specifications to figure out a certain numeric value. That's what we have value_string for, IMHO -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 12 Jan 2020 10:40:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:41:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:41:20 +0000 Subject: Change in osmo-hlr[master]: hlr: remove unused internal USSD list In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16807 ) Change subject: hlr: remove unused internal USSD list ...................................................................... hlr: remove unused internal USSD list struct hlr.iuse_list is not used at all. Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 --- M include/osmocom/hlr/hlr.h M src/hlr.c 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index 18c4a1d..0564518 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -46,7 +46,6 @@ struct llist_head euse_list; struct hlr_euse *euse_default; - struct llist_head iuse_list; /* NCSS (call independent) session guard timeout value */ int ncss_guard_timeout; diff --git a/src/hlr.c b/src/hlr.c index 38b9022..656f0a4 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -846,7 +846,6 @@ g_hlr = talloc_zero(hlr_ctx, struct hlr); INIT_LLIST_HEAD(&g_hlr->euse_list); - INIT_LLIST_HEAD(&g_hlr->iuse_list); INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); g_hlr->db_file_path = talloc_strdup(g_hlr, HLR_DEFAULT_DB_FILE_PATH); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7b51c195bbc107beb0a0bde72b266757fc4fd5e2 Gerrit-Change-Number: 16807 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:47:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:47:26 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... Patch Set 1: So if I understand this correctly, the mmcontext still is a GERAN mm context, but we just received the first RAU via UMTS, and then we run into this condition? Seems like something we should have a test for. Looking at the code, we do have SGSN_Tests_Iu.TC_geran_attach_iu_rau(), which is currently commented out. So what's missing here is: * reference to the OS# issue that describes the bug * reference to the test case * reference to the Change-ID of the change that enables the test case once this is merged. We should have that much discipline, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 10:47:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 ) Change subject: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests ...................................................................... WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests Change-Id: Ib6004d2b23c8207faac7f8b7bd07e84c404cd84d --- A SCCP_Test/gen_links.sh A SCCP_Test/regen_makefile.sh 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/16811/1 diff --git a/SCCP_Test/gen_links.sh b/SCCP_Test/gen_links.sh new file mode 100755 index 0000000..c980844 --- /dev/null +++ b/SCCP_Test/gen_links.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# required by M3UA_Emulation +DIR=$BASEDIR/titan.ProtocolModules.M3UA/src +FILES="M3UA_Types.ttcn" +gen_links $DIR $FILES + +# required by M3UA_Emulation +DIR=$BASEDIR/titan.TestPorts.SCTPasp/src +FILES="SCTPasp_PT.cc SCTPasp_PT.hh SCTPasp_PortType.ttcn SCTPasp_Types.ttcn" +gen_links $DIR $FILES + +# required by SCCP Emulation +DIR=$BASEDIR/titan.ProtocolEmulations.M3UA/src +FILES="M3UA_Emulation.ttcn" +gen_links $DIR $FILES + +# required by SCCP Emulation +DIR=$BASEDIR/titan.TestPorts.MTP3asp/src +FILES="MTP3asp_PortType.ttcn MTP3asp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src +FILES="SCCP_Emulation.ttcn SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn +Native_Functions.ttcn Native_FunctionDefs.cc SCCP_Templates.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh new file mode 100755 index 0000000..9472e0c --- /dev/null +++ b/SCCP_Test/regen_makefile.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +MAIN=SCCP_Testcases.ttcn + +FILES="*.ttcn *.ttcnpp" + +../regen-makefile.sh $MAIN $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 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: Ib6004d2b23c8207faac7f8b7bd07e84c404cd84d Gerrit-Change-Number: 16811 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 ) Change subject: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt ...................................................................... SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt It seems that our TTCN3 VTY/Telnet module no longer supports '-' inside prompt. However, older sccp_demu_user programs in libosmo-sccp.git before Change-Id I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb use this. Let's adjust our expectation here to the new dash-less variant. Change-Id: Ib00f1f89bf1484d8a8e07be8c0a1fc849bcf03a0 --- M sccp/SCCP_Tests.default 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/16812/1 diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index 95e0d2f..f837664 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -16,7 +16,7 @@ *.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered" *.SCCP_DEMO_USER_VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" -*.SCCP_DEMO_USER_VTY.PROMPT1 := "sccp-demo-user> " +*.SCCP_DEMO_USER_VTY.PROMPT1 := "SccpDemoUser> " [MODULE_PARAMETERS] M3UA_Emulation.tsp_logVerbose := true; @@ -35,7 +35,7 @@ } }; -Osmocom_VTY_Functions.mp_prompt_prefix := "sccp-demo-user"; +Osmocom_VTY_Functions.mp_prompt_prefix := "SccpDemoUser"; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 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: Ib00f1f89bf1484d8a8e07be8c0a1fc849bcf03a0 Gerrit-Change-Number: 16812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 ) Change subject: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP ...................................................................... deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP This allows us to use the ConvertPDUEncodedAddressToASPAddress() functions from outside SCCP_CT. See Change-Id I72351168d4e0e79cea3319a537d51d47027266f4 Change-Id: I38b47c3b382281d0e7a3d80d1630362096949b6f --- M deps/Makefile 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16813/1 diff --git a/deps/Makefile b/deps/Makefile index 5d263aa..d39cec2 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -57,14 +57,14 @@ titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ - titan.ProtocolEmulations.SCCP OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ titan.ProtocolModules.M3UA \ - titan.ProtocolEmulations.M3UA + titan.ProtocolEmulations.M3UA \ + titan.ProtocolEmulations.SCCP OSMOGIT_REPOS= titan.ProtocolModules.MAP \ titan.ProtocolModules.BSSMAP \ @@ -77,7 +77,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.30.A titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea -titan.ProtocolEmulations.SCCP_commit= R.7.A-2-g724c83f +titan.ProtocolEmulations.SCCP_commit= 9e70fba95bb3dfaf09f5f8260177401ef4cceda7 titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A titan.ProtocolModules.BSSMAP_commit= master -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 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: I38b47c3b382281d0e7a3d80d1630362096949b6f Gerrit-Change-Number: 16813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Add SCCP_Tests_RAW for testing the actual SCCP implementation Using SCCP_Tests_RAW.ttcn we can trasnceive decoded MTP3 primitives containing decoded SCCP messages against a remote SCCP implementation. Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc --- A sccp/SCCP_CodecPort.ttcn A sccp/SCCP_Tests_RAW.cfg A sccp/SCCP_Tests_RAW.ttcn 3 files changed, 269 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16814/1 diff --git a/sccp/SCCP_CodecPort.ttcn b/sccp/SCCP_CodecPort.ttcn new file mode 100644 index 0000000..665ef9e --- /dev/null +++ b/sccp/SCCP_CodecPort.ttcn @@ -0,0 +1,71 @@ +module SCCP_CodecPort { + +/* Simple SCCP Codec Port, translating between raw MTP3 primitives with + * octetstring payload towards the MTP3 imovider, and MTP3-SCCP primitives + * which carry the decoded SCCP data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from General_Types all; +import from Osmocom_Types all; + +import from MTP3asp_Types all; +import from MTP3asp_PortType all; +import from SCCP_Types all; + +/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERind with PDU_SCCP instead of octetstring */ +type record SCCP_MTP3_TRANSFERind { + MTP3_Field_sio sio, + integer opc, + integer dpc, + integer sls, + PDU_SCCP data +}; + +/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERreq with PDU_SCCP instead of octetstring */ +type record SCCP_MTP3_TRANSFERreq { + MTP3_Field_sio sio, + integer opc, + integer dpc, + integer sls, + PDU_SCCP data +}; + +private function f_dec_TRANSFERind(in ASP_MTP3_TRANSFERind pin, out SCCP_MTP3_TRANSFERind pout) { + pout.sio := pin.sio; + pout.opc := pin.opc; + pout.dpc := pin.dpc; + pout.data := dec_PDU_SCCP(pin.data); + //port.setstate(0); +} with {extension "prototype(fast)" } + + +private function f_enc_TRANSFERreq(in SCCP_MTP3_TRANSFERreq pin, out ASP_MTP3_TRANSFERreq pout) { + pout.sio := pin.sio; + pout.opc := pin.opc; + pout.dpc := pin.dpc; + pout.data := enc_PDU_SCCP(pin.data); + //port.setstate(0); +} with {extension "prototype(fast)" } + +type port SCCP_CODEC_PT message { + out SCCP_MTP3_TRANSFERreq; + in SCCP_MTP3_TRANSFERind, + ASP_MTP3_PAUSE, + ASP_MTP3_RESUME, + ASP_MTP3_STATUS; +} with { extension "internal user MTP3asp_PT + out(SCCP_MTP3_TRANSFERreq -> ASP_MTP3_TRANSFERreq: function(f_enc_TRANSFERreq)) + in(ASP_MTP3_TRANSFERind -> SCCP_MTP3_TRANSFERind: function(f_dec_TRANSFERind); + ASP_MTP3_PAUSE -> ASP_MTP3_PAUSE: simple; + ASP_MTP3_RESUME -> ASP_MTP3_RESUME: simple; + ASP_MTP3_STATUS -> ASP_MTP3_STATUS: simple)" +} + + +} diff --git a/sccp/SCCP_Tests_RAW.cfg b/sccp/SCCP_Tests_RAW.cfg new file mode 100644 index 0000000..e2fc17b --- /dev/null +++ b/sccp/SCCP_Tests_RAW.cfg @@ -0,0 +1,34 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./SCCP_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] +*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" + +[MODULE_PARAMETERS] +M3UA_Emulation.tsp_SCTP_Server_Mode := false; +M3UA_Emulation.tsp_M3UA_Server_Mode := false; +SCCP_Tests.sccp_cfg := { + { + sccp_service_type := "mtp3_itu", + //sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, + sctp_addr := { 2905, "127.0.0.2", 2905, "127.0.0.1" }, + own_pc := 23, + own_ssn := 254, + peer_pc := 1, + peer_ssn := 254, + sio := '83'O, + rctx := 0 + } +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +SCCP_Tests_RAW.control diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn new file mode 100644 index 0000000..5836e3e --- /dev/null +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -0,0 +1,164 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * The idea is that these tests are executed against sccp_demo_user from + * libosmo-sccp.git in server mode. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module SCCP_Tests_RAW { + +import from General_Types all; +import from Osmocom_Types all; + +import from M3UA_Emulation all; + +import from SCCP_Types all; +import from SCCPasp_Types all; +import from SCCP_Templates all; +import from SCCP_Emulation all; +import from SCCP_CodecPort all; + +import from TELNETasp_PortType all; +import from Osmocom_VTY_Functions all; + +import from SCCP_Tests all; + +type component SCCP_Test_RAW_CT { + /* VTY to sccp_demo_user (not used yet) */ + port TELNETasp_PT SCCP_DEMO_USER_VTY; + + /* SCCP raw port runs on top of M3UA Emulation. + * "System Under Test" is libosmo-sccp's sccp_demo_user example program. */ + var M3UA_CT vc_M3UA; + port SCCP_CODEC_PT MTP3; + + var MSC_SCCP_MTP3_parameters g_param; +} + +private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT { + g_param := { + sio := { + ni := substr(oct2bit(cfg.sio),0,2), + prio := substr(oct2bit(cfg.sio),2,2), + si := substr(oct2bit(cfg.sio),4,4) + }, + opc := cfg.own_pc, + dpc := cfg.peer_pc, + sls := 0, + sccp_serviceType := cfg.sccp_service_type, + ssn := cfg.own_ssn + }; + + map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); + f_vty_set_prompts(SCCP_DEMO_USER_VTY); + f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + + /* Create and connect test components */ + vc_M3UA := M3UA_CT.create; + connect(self:MTP3, vc_M3UA:MTP3_SP_PORT); + map(vc_M3UA:SCTP_PORT, system:sctp); + + vc_M3UA.start(f_M3UA_Emulation(cfg.sctp_addr)); +} + +private function f_cleanup() runs on SCCP_Test_RAW_CT { + all component.stop; + unmap(vc_M3UA:SCTP_PORT, system:sctp); + disconnect(vc_M3UA:MTP3_SP_PORT, self:MTP3); + self.stop +} + +/* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 + +template (value) PDU_SCCP ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address called) := { + connrequest := { + messageType := cc, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := 2, + pointer2 := 0, + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + optionalPart := { + credit := omit, + callingPAddress := omit, + data := omit, + hopCounter := omit, + importance := omit + }, + eop := omit + } +} + +template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 dest_lref, + template (present) OCT3 source_lref) := { + connconfirm := { + messageType := cr, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := 1, + optionalPart := *, + eop := * + } +} + +private function f_send_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { + var SCCP_MTP3_TRANSFERreq tx := { + sio := g_param.sio, + opc := g_param.opc, + dpc := g_param.dpc, + sls := g_param.sls, + data := valueof(sccp) + }; + MTP3.send(tx); +} + +private function f_exp_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { + var SCCP_MTP3_TRANSFERind rx; + var template SCCP_MTP3_TRANSFERind exp := { + sio := g_param.sio, + opc := g_param.opc, + dpc := g_param.dpc, + sls := g_param.sls, + data := sccp + }; + timer T := 10.0; + T.start; + alt { + [] MTP3.receive(exp) -> value rx { + setverdict(pass); + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", exp); + } + } +} + + +testcase TC_foo() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc, sccp_cfg[0].peer_ssn, + sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, + sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + f_init_raw(sccp_cfg[0]); + f_sleep(1.0); + f_send_sccp(ts_SCCP_CR('000001'O, called)); + f_exp_sccp(tr_SCCP_CC('000001'O, ?)); +} + +control { + +} + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Switch back to upstream for more repositories References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 ) Change subject: deps/Makefile: Switch back to upstream for more repositories ...................................................................... deps/Makefile: Switch back to upstream for more repositories Upstream TITAN has merged some of our changes upstream, so we can move away from our forked repositories Change-Id: I91a1e13173e059a94fb76858ec1a1879ab1a8686 --- M deps/Makefile 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/16815/1 diff --git a/deps/Makefile b/deps/Makefile index d39cec2..ec60d45 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -24,6 +24,7 @@ titan.ProtocolModules.IP \ titan.ProtocolModules.JSON_v07_2006 \ titan.ProtocolModules.L2TP \ + titan.ProtocolModules.M3UA \ titan.ProtocolModules.SMPP \ titan.ProtocolModules.TCP \ titan.ProtocolModules.UDP \ @@ -53,16 +54,15 @@ titan.ProtocolModules.GTP_v13.5.0 \ titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ISUP_Q.762 \ + titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ - titan.ProtocolModules.LLC_v7.1.0 \ - titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ - titan.ProtocolModules.M3UA \ titan.ProtocolEmulations.M3UA \ titan.ProtocolEmulations.SCCP @@ -90,10 +90,10 @@ titan.ProtocolModules.ISUP_Q.762_commit= R.8.A titan.ProtocolModules.JSON_v07_2006_commit= R.1.A titan.ProtocolModules.L2TP_commit= R.2.A -titan.ProtocolModules.LLC_v7.1.0_commit= 2a3c09fbf7bae22f802aa88689800f38a1f3732d +titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248d titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A -titan.ProtocolModules.M3UA_commit= 2544b6bdc76d18313a235fbfdaf0cac04ebdd603 +titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad titan.ProtocolModules.NS_v7.3.0_commit= R.2.A @@ -101,7 +101,7 @@ titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 +titan.ProtocolModules.SGsAP_13.2.0_commit= 5ccaeab7b3093e2bd8e88eee73c8362d1a2e4f32 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 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: I91a1e13173e059a94fb76858ec1a1879ab1a8686 Gerrit-Change-Number: 16815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:52:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:52:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update most of our dependencies to upstream References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 ) Change subject: deps/Makefile: Update most of our dependencies to upstream ...................................................................... deps/Makefile: Update most of our dependencies to upstream Upstream TITAN repositories have almost no actual code changes. However, they did switch to MPLv2, and they did update documentation from word documents to asciidoc. Change-Id: If5bd3d567de40ec2f72cdf63499435ac0bb4047e --- M deps/Makefile 1 file changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/16816/1 diff --git a/deps/Makefile b/deps/Makefile index ec60d45..012b925 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -75,53 +75,53 @@ # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. # In order to keep local changes in the repository of a dependency, set its commit to the # name of a local branch here (e.g. 'master'). -titan.Libraries.TCCUsefulFunctions_commit= R.30.A +titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea -titan.ProtocolEmulations.SCCP_commit= 9e70fba95bb3dfaf09f5f8260177401ef4cceda7 -titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A -titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A +titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba +titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 +titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 titan.ProtocolModules.BSSMAP_commit= master -titan.ProtocolModules.GRE_commit= R.2.A -titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A -titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A -titan.ProtocolModules.ICMP_commit= R.2.A -titan.ProtocolModules.ICMPv6_commit= R.2.A -titan.ProtocolModules.IP_commit= R.10.B-1-g99d0ec9 -titan.ProtocolModules.ISUP_Q.762_commit= R.8.A +titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446 +titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A-5-ge120ace +titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A-5-g85cb124 +titan.ProtocolModules.ICMP_commit= e49d9fb9f7de637b4bf4803dc6b6e911a8661640 +titan.ProtocolModules.ICMPv6_commit= 46f4d9b6e1e3c794294a92588401a81e4881dd27 +titan.ProtocolModules.IP_commit= 1be86705f39ae38f3c04b2109806ee20d25e91d0 +titan.ProtocolModules.ISUP_Q.762_commit= R.8.A-5-g42d428b titan.ProtocolModules.JSON_v07_2006_commit= R.1.A -titan.ProtocolModules.L2TP_commit= R.2.A +titan.ProtocolModules.L2TP_commit= 17e76d3662bd0bb815158e8a9de1ec413f21b530 titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248d titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d -titan.ProtocolModules.M2PA_commit= R.2.A +titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A -titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad -titan.ProtocolModules.NS_v7.3.0_commit= R.2.A -titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.MobileL3_v13.4.0_commit= 2b5149e158e8077a7b9cf431b0c6b635f874c63b +titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c +titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 +titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 -titan.ProtocolModules.ROSE_commit= R.1.C -titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 5ccaeab7b3093e2bd8e88eee73c8362d1a2e4f32 -titan.ProtocolModules.SDP_commit= R.14.A -titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 -titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -titan.ProtocolModules.SUA_commit= R.5.A -titan.ProtocolModules.TCP_commit= R.3.A -titan.ProtocolModules.UDP_commit= R.4.A -titan.TestPorts.Common_Components.Socket-API_commit= R.6.A -titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B -titan.TestPorts.GPIO_commit= R.3.A -titan.TestPorts.HTTPmsg_commit= R.9.B -titan.TestPorts.IPL4asp_commit= R.29.A -titan.TestPorts.LANL2asp_commit= R.8.B +titan.ProtocolModules.ROSE_commit= R.1.C-5-g0f6774c +titan.ProtocolModules.SCTP_commit= R.2.A-5-g556ef3f +titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B-3-g5ccaeab +titan.ProtocolModules.SDP_commit= R.14.A-6-g7f00ea0 +titan.ProtocolModules.SMPP_commit= R.2.A-5-gf2c9017 +titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A-5-gd0f0ce6 +titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a +titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 +titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 +titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-5-g86b7d7f +titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 +titan.TestPorts.GPIO_commit= R.2.A-8-g9728492 +titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde +titan.TestPorts.IPL4asp_commit= R.30.C-3-g24f0681 +titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265 titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 -titan.TestPorts.PCAPasp_commit= R.7.A +titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 -titan.TestPorts.TCPasp_commit= R.9.A -titan.TestPorts.TELNETasp_commit= R.9.A -titan.TestPorts.UDPasp_commit= R.8.A -titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-4-gbacd73d +titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 +titan.TestPorts.TELNETasp_commit= R.9.A-3-g62f281b +titan.TestPorts.UDPasp_commit= R.8.B-3-gbf5e87b +titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-8-g7ec4fe0 titan.TestPorts.USB_commit= master all: $(foreach dir,$(ALL_REPOS),$(dir)/update) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 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: If5bd3d567de40ec2f72cdf63499435ac0bb4047e Gerrit-Change-Number: 16816 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:53:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 10:53:30 +0000 Subject: Change in osmo-sgsn[master]: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 ) Change subject: fix nullpointer: in gsm48_rx_gmm_ra_upd_req() ...................................................................... fix nullpointer: in gsm48_rx_gmm_ra_upd_req() This caused frequent crashes at 36c3. The "proper" fix is probably elsewhere (lynxis mentions an unfinished patch), but at least this prevented some crashes during active operation. Once this is merged, we can (re)enable SGSN_Tests_Iu.TC_geran_attach_iu_rau, which tests exactly for this scenario: A Subscriber / MM context that is so far attached via GERAN, but now receives a RAU via UTRAN/Iu. Closes: OS#4339 Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc --- M src/sgsn/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/16744/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifde15dc4151d84748f0e67b32c9c260cb2d9d8fc Gerrit-Change-Number: 16744 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 10:54:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jan 2020 10:54:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 12 Jan 2020 10:54:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 11:21:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 11:21:15 +0000 Subject: Change in libosmo-abis[master]: dahdi: Don't use perror() directly, use osmocom logging instead References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16817 ) Change subject: dahdi: Don't use perror() directly, use osmocom logging instead ...................................................................... dahdi: Don't use perror() directly, use osmocom logging instead Change-Id: I287e10ee49a8ac26eef903568b29a3b2abf3b43e --- M src/input/dahdi.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/17/16817/1 diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 5da0a2d..4d01fe0 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -181,11 +181,13 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } return e1inp_rx_ts_lapd(e1i_ts, msg); @@ -294,11 +296,13 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } return e1inp_rx_ts(e1i_ts, msg, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I287e10ee49a8ac26eef903568b29a3b2abf3b43e Gerrit-Change-Number: 16817 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:38:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:38:15 +0000 Subject: Change in libosmo-abis[master]: introduce and use logging macros with context on E1 line / timeslot References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16818 ) Change subject: introduce and use logging macros with context on E1 line / timeslot ...................................................................... introduce and use logging macros with context on E1 line / timeslot Change-Id: I447a2360757fed97ed50f9db1e2efbf2f90e46a0 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/dahdi.c M src/input/misdn.c M src/input/rs232.c M src/input/unixsocket.c 6 files changed, 123 insertions(+), 155 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/18/16818/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index e6d5154..de1c504 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -14,6 +14,12 @@ #define NUM_E1_TS 32 #define E1INP_USE_DEFAULT (-1) +#define LOGPITS(e1ts, ss, level, fmt, args ...) \ + LOGP(ss, level, "E1TS(%u:%u) " fmt, (e1ts)->line->num, (e1ts)->num, ## args) + +#define LOGPIL(e1l, ss, level, fmt, args ...) \ + LOGP(ss, level, "E1L(%u) " fmt, (e1l)->num, ## args) + enum e1inp_sign_type { E1INP_SIGN_NONE, E1INP_SIGN_OML, diff --git a/src/e1_input.c b/src/e1_input.c index 9e2f7b0..a707438 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -354,8 +354,7 @@ line = e1inp_line_find(e1_nr); if (line) { - LOGP(DLINP, LOGL_ERROR, "E1 Line %u already exists\n", - e1_nr); + LOGPIL(line, DLINP, LOGL_ERROR, "E1 Line %u already exists\n", e1_nr); return NULL; } @@ -375,7 +374,7 @@ line->rate_ctr = rate_ctr_group_alloc(line, &e1inp_ctr_g_d, line->num); if (!line->rate_ctr) { - LOGP(DLINP, LOGL_ERROR, "Cannot allocate counter group\n"); + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot allocate counter group\n"); talloc_free(line); return NULL; } @@ -429,7 +428,7 @@ { int old_refcnt = line->refcnt++; - LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", + LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", line->name, line, old_refcnt, line->refcnt); } @@ -437,7 +436,7 @@ { int old_refcnt = line->refcnt--; - LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", + LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", line->name, line, old_refcnt, line->refcnt); if (line->refcnt == 0) { @@ -598,13 +597,13 @@ /* consult the list of signalling links */ link = e1inp_lookup_sign_link(ts, tei, sapi); if (!link) { - LOGP(DLMI, LOGL_ERROR, "didn't find signalling link for " + LOGPITS(ts, DLMI, LOGL_ERROR, "didn't find signalling link for " "tei %d, sapi %d\n", tei, sapi); msgb_free(msg); return -EINVAL; } if (!ts->line->ops->sign_link) { - LOGP(DLINP, LOGL_ERROR, "Fix your application, " + LOGPITS(ts, DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); msgb_free(msg); return -ENOENT; @@ -624,7 +623,7 @@ break; default: ret = -EINVAL; - LOGP(DLMI, LOGL_ERROR, "unknown TS type %u\n", ts->type); + LOGPITS(ts, DLMI, LOGL_ERROR, "unknown TS type %u\n", ts->type); msgb_free(msg); break; } @@ -652,7 +651,7 @@ else tei = msg->data[1] >> 1; - DEBUGP(DLMI, "<= len = %d, sapi(%d) tei(%d)\n", msg->len, sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "<= len = %d, sapi(%d) tei(%d)\n", msg->len, sapi, tei); ret = lapd_receive(e1i_ts->lapd, msg, &error); if (ret < 0) { @@ -679,18 +678,18 @@ switch (dp->oph.primitive) { case PRIM_DL_EST: - DEBUGP(DLMI, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); e1inp_event(e1i_ts, S_L_INP_TEI_UP, tei, sapi); break; case PRIM_DL_REL: - DEBUGP(DLMI, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); e1inp_event(e1i_ts, S_L_INP_TEI_DN, tei, sapi); break; case PRIM_DL_DATA: case PRIM_DL_UNIT_DATA: if (dp->oph.operation == PRIM_OP_INDICATION) { msg->l2h = msg->l3h; - DEBUGP(DLMI, "RX: %s sapi=%d tei=%d\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s sapi=%d tei=%d\n", osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), sapi, tei); e1inp_rx_ts(e1i_ts, msg, tei, sapi); @@ -698,7 +697,7 @@ } break; case PRIM_MDL_ERROR: - DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); break; default: printf("ERROR: unknown prim\n"); @@ -738,8 +737,7 @@ return NULL; len = subchan_mux_out(&e1i_ts->trau.mux, msg->data, 40); if (len != 40) { - LOGP(DLMI, LOGL_ERROR, - "cannot transmit, failed to mux\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "cannot transmit, failed to mux\n"); msgb_free(msg); return NULL; } @@ -754,7 +752,7 @@ msg = msgb_dequeue(&e1i_ts->hdlc.tx_queue); break; default: - LOGP(DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", e1i_ts->type); return NULL; } return msg; diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 4d01fe0..6da1a02 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -134,7 +134,7 @@ if (rc < 0) return; - LOGP(DLMI, LOGL_NOTICE, "Line %u(%s) / TS %u DAHDI EVENT %s\n", + LOGPITS(ts, DLMI, LOGL_NOTICE, "Line %u(%s) / TS %u DAHDI EVENT %s\n", ts->line->num, ts->line->name, ts->num, get_value_string(dahdi_evt_names, evt)); @@ -181,12 +181,12 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -199,7 +199,7 @@ * writeset, since it doesn't support poll() based * write flow control */ if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { - LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -229,7 +229,7 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int handle_ts1_write(struct osmo_fd *bfd) @@ -249,7 +249,7 @@ return 0; } - DEBUGP(DLMI, "TX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "TX: %s\n", osmo_hexdump(msg->data, msg->len)); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); @@ -278,7 +278,7 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int handle_hdlc_read(struct osmo_fd *bfd) @@ -296,12 +296,12 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -351,13 +351,12 @@ ret = subchan_mux_out(mx, tx_buf, D_BCHAN_TX_GRAN); if (ret != D_BCHAN_TX_GRAN) { - LOGP(DLINP, LOGL_DEBUG, "Huh, got ret of %d\n", ret); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Huh, got ret of %d\n", ret); if (ret < 0) return ret; } - DEBUGP(DLMIB, "BCHAN TX: %s\n", - osmo_hexdump(tx_buf, D_BCHAN_TX_GRAN)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN TX: %s\n", osmo_hexdump(tx_buf, D_BCHAN_TX_GRAN)); if (invertbits) { flip_buf_bits(tx_buf, ret); @@ -365,7 +364,7 @@ ret = write(bfd->fd, tx_buf, ret); if (ret < D_BCHAN_TX_GRAN) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, D_BCHAN_TX_GRAN); return ret; @@ -386,8 +385,7 @@ ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE); if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { - LOGP(DLINP, LOGL_DEBUG, "read error %d %s\n", - ret, strerror(errno)); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno)); return ret; } @@ -398,8 +396,7 @@ msgb_put(msg, ret); msg->l2h = msg->data; - DEBUGP(DLMIB, "BCHAN RX: %s\n", - osmo_hexdump(msgb_l2(msg), ret)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret)); ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); /* physical layer indicates that data has been sent, * we thus can send some more data */ @@ -426,12 +423,11 @@ /* This might lead to a transmit underrun, as we call tx * from the rx path, as there's no select/poll on dahdi * */ - LOGP(DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " "expected %u\n", msg->len, D_BCHAN_TX_GRAN); } - DEBUGP(DLMIB, "RAW CHAN TX: %s\n", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); if (0/*invertbits*/) { flip_buf_bits(msg->data, msg->len); @@ -439,8 +435,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < msg->len) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", - ret, msg->len); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); msgb_free(msg); return ret; @@ -459,8 +454,7 @@ ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE); if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { - LOGP(DLINP, LOGL_DEBUG, "read error %d %s\n", - ret, strerror(errno)); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno)); return ret; } @@ -471,8 +465,7 @@ msgb_put(msg, ret); msg->l2h = msg->data; - DEBUGP(DLMIB, "RAW CHAN RX: %s\n", - osmo_hexdump(msgb_l2(msg), ret)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret)); ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); /* physical layer indicates that data has been sent, * we thus can send some more data */ @@ -530,8 +523,7 @@ * write flow control */ break; default: - LOGP(DLINP, LOGL_NOTICE, - "unknown E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown E1 TS type %u\n", e1i_ts->type); break; } @@ -641,9 +633,8 @@ scfg = span_cfgs[line->port_nr]; if (!scfg) { - LOGP(DLMI, LOGL_ERROR, "Line %u(%s): DAHDI Port %u (Span %u) " - "doesn't exist\n", line->num, line->name, line->port_nr, - line->port_nr+1); + LOGPIL(line, DLMI, LOGL_ERROR, "Line %u(%s): DAHDI Port %u (Span %u) doesn't exist\n", + line->num, line->name, line->port_nr, line->port_nr+1); return -EIO; } @@ -733,9 +724,7 @@ ret = osmo_fd_register(bfd); if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, - "could not register FD: %s\n", - strerror(ret)); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); return ret; } } diff --git a/src/input/misdn.c b/src/input/misdn.c index bdca9d5..fef1c0f 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -124,21 +124,21 @@ msgb_put(msg, ret); - DEBUGP(DLMI, "alen =%d, dev(%d) channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "alen =%d, dev(%d) channel(%d) sapi(%d) tei(%d)\n", alen, l2addr.dev, l2addr.channel, l2addr.sapi, l2addr.tei); - DEBUGP(DLMI, "<= len = %d, prim(0x%x) id(0x%x): %s\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "<= len = %d, prim(0x%x) id(0x%x): %s\n", ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case DL_INFORMATION_IND: /* mISDN tells us which channel number is allocated for this * tuple of (SAPI, TEI). */ - DEBUGP(DLMI, "DL_INFORMATION_IND: use channel(%d) sapi(%d) tei(%d) for now\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_INFORMATION_IND: use channel(%d) sapi(%d) tei(%d) for now\n", l2addr.channel, l2addr.sapi, l2addr.tei); link = e1inp_lookup_sign_link(e1i_ts, l2addr.tei, l2addr.sapi); if (!link) { - DEBUGPC(DLMI, "mISDN message for unknown sign_link\n"); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "mISDN message for unknown sign_link\n"); msgb_free(msg); return -EINVAL; } @@ -147,14 +147,14 @@ msgb_free(msg); break; case DL_ESTABLISH_IND: - DEBUGP(DLMI, "DL_ESTABLISH_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_ESTABLISH_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); /* For some strange reason, sometimes the DL_INFORMATION_IND tells * us the wrong channel, and we only get the real channel number * during the DL_ESTABLISH_IND */ link = e1inp_lookup_sign_link(e1i_ts, l2addr.tei, l2addr.sapi); if (!link) { - DEBUGPC(DLMI, "mISDN message for unknown sign_link\n"); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "mISDN message for unknown sign_link\n"); msgb_free(msg); return -EINVAL; } @@ -164,7 +164,7 @@ msgb_free(msg); break; case DL_RELEASE_IND: - DEBUGP(DLMI, "DL_RELEASE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_RELEASE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); ret = e1inp_event(e1i_ts, S_L_INP_TEI_DN, l2addr.tei, l2addr.sapi); msgb_free(msg); @@ -172,33 +172,33 @@ case DL_DATA_IND: case DL_UNITDATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMI, "RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); if (mline->use_userspace_lapd) { - LOGP(DLMI, LOGL_ERROR, "DL_DATA_IND but userspace LAPD ?!?\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "DL_DATA_IND but userspace LAPD ?!?\n"); msgb_free(msg); return -EIO; } ret = e1inp_rx_ts(e1i_ts, msg, l2addr.tei, l2addr.sapi); break; case PH_ACTIVATE_IND: - DEBUGP(DLMI, "PH_ACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_ACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); msgb_free(msg); break; case PH_DEACTIVATE_IND: - DEBUGP(DLMI, "PH_DEACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_DEACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); msgb_free(msg); break; case PH_DATA_IND: if (!mline->use_userspace_lapd) { - LOGP(DLMI, LOGL_ERROR, "PH_DATA_IND but kernel LAPD ?!?\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "PH_DATA_IND but kernel LAPD ?!?\n"); return -EIO; } /* remove the Misdn Header */ msgb_pull(msg, MISDN_HEADER_LEN); /* hand into the LAPD code */ - DEBUGP(DLMI, "RX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s\n", osmo_hexdump(msg->data, msg->len)); ret = e1inp_rx_ts_lapd(e1i_ts, msg); break; default: @@ -252,9 +252,8 @@ } if (mline->use_userspace_lapd) { - DEBUGP(DLMI, "TX %u/%u/%u: %s\n", - line->num, sign_link->tei, sign_link->sapi, - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX %u/%u/%u: %s\n", line->num, sign_link->tei, + sign_link->sapi, osmo_hexdump(msg->data, msg->len)); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); ret = 0; @@ -265,7 +264,7 @@ hh = (struct mISDNhead *) msgb_push(msg, sizeof(*hh)); hh->prim = DL_DATA_REQ; - DEBUGP(DLMI, "TX channel(%d) TEI(%d) SAPI(%d): %s\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX channel(%d) TEI(%d) SAPI(%d): %s\n", sign_link->driver.misdn.channel, sign_link->tei, sign_link->sapi, osmo_hexdump(l2_data, msg->len - MISDN_HEADER_LEN)); @@ -295,13 +294,13 @@ static void misdn_write_msg(struct msgb *msg, void *cbdata) { struct osmo_fd *bfd = cbdata; -// struct e1inp_line *line = bfd->data; -// unsigned int ts_nr = bfd->priv_nr; -// struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; struct mISDNhead *hh; int ret; - DEBUGP(DLMI, "PH_DATA_REQ: len=%d %s\n", msg->len, + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_DATA_REQ: len=%d %s\n", msg->len, osmo_hexdump(msg->data, msg->len)); hh = (struct mISDNhead *) msgb_push(msg, MISDN_HEADER_LEN); @@ -310,7 +309,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "write failed %d\n", ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "write failed %d\n", ret); msgb_free(msg); } @@ -332,13 +331,11 @@ subchan_mux_out(mx, tx_buf+sizeof(*hh), len); - DEBUGP(DLMIB, "BCHAN TX: %s\n", - osmo_hexdump(tx_buf+sizeof(*hh), len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN TX: %s\n", osmo_hexdump(tx_buf+sizeof(*hh), len)); ret = send(bfd->fd, tx_buf, sizeof(*hh) + len, 0); if (ret < sizeof(*hh) + len) - DEBUGP(DLMIB, "send returns %d instead of %zu\n", ret, - sizeof(*hh) + len); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "send returns %d instead of %zu\n", ret, sizeof(*hh) + len); return ret; } @@ -368,14 +365,13 @@ msgb_put(msg, ret); if (hh->prim != PH_CONTROL_IND) - DEBUGP(DLMIB, "<= BCHAN len = %d, prim(0x%x) id(0x%x): %s\n", - ret, hh->prim, hh->id, - get_value_string(prim_names, hh->prim)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "<= BCHAN len = %d, prim(0x%x) id(0x%x): %s\n", + ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case PH_DATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMIB, "BCHAN RX: %s\n", + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); /* the number of bytes received indicates that data to send */ handle_tsX_write(bfd, msgb_l2len(msg)); @@ -411,12 +407,10 @@ /* This might lead to a transmit underrun, as we call tx * from the rx path, as there's no select/poll on dahdi * */ - LOGP(DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " - "expected %u\n", msg->len, len); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, expected %u\n", msg->len, len); } - DEBUGP(DLMIB, "RAW CHAN TX: %s\n", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); hh = (struct mISDNhead *) msgb_push(msg, sizeof(*hh)); hh->prim = PH_DATA_REQ; @@ -424,8 +418,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < msg->len) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", - ret, msg->len); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); msgb_free(msg); return ret; @@ -454,14 +447,13 @@ msgb_put(msg, ret); if (hh->prim != PH_CONTROL_IND) - DEBUGP(DLMIB, "<= RAW CHAN len = %d, prim(0x%x) id(0x%x): %s\n", - ret, hh->prim, hh->id, - get_value_string(prim_names, hh->prim)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "<= RAW CHAN len = %d, prim(0x%x) id(0x%x): %s\n", + ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case PH_DATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMIB, "RAW CHAN RX: %s\n", + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); /* the number of bytes received indicates that data to send */ handle_ts_raw_write(bfd, msgb_l2len(msg)); @@ -661,8 +653,7 @@ addr.channel = ts; break; default: - DEBUGP(DLMI, "unsupported E1 TS type: %u\n", - e1i_ts->type); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type: %u\n", e1i_ts->type); break; } @@ -724,7 +715,7 @@ close(sk); return -ENODEV; } - //DEBUGP(DLMI,"%d device%s found\n", cnt, (cnt==1)?"":"s"); + //LOGPIL(line, DLMI, LOGL_DEBUG, "%d device%s found\n", cnt, (cnt==1)?"":"s"); printf("%d device%s found\n", cnt, (cnt==1)?"":"s"); #if 1 devinfo.id = line->port_nr; diff --git a/src/input/rs232.c b/src/input/rs232.c index c801ab2..dfbf97c 100644 --- a/src/input/rs232.c +++ b/src/input/rs232.c @@ -94,14 +94,14 @@ /* no message after tx delay timer */ return 0; } - DEBUGP(DLMI, "rs232 TX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "rs232 TX: %s\n", osmo_hexdump(msg->data, msg->len)); rs232_build_msg(msg); /* send over serial line */ written = write(bfd->fd, msg->data, msg->len); if (written < msg->len) { - LOGP(DLMI, LOGL_ERROR, "rs232: short write\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: short write\n"); msgb_free(msg); return -1; } @@ -118,6 +118,7 @@ static int handle_ser_read(struct osmo_fd *bfd) { struct serial_handle *sh = bfd->data; + struct e1inp_ts *e1i_ts = &sh->line->ts[0]; struct msgb *msg; int rc = 0; @@ -131,7 +132,7 @@ if (msg->len < 2) { rc = read(bfd->fd, msg->tail, 2 - msg->len); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: error reading from " + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: error reading from " "serial port: %s\n", strerror(errno)); msgb_free(msg); return rc; @@ -141,16 +142,14 @@ if (msg->len >= 2) { /* parse CRAPD payload length */ if (msg->data[0] != 0) { - LOGP(DLMI, LOGL_ERROR, - "Suspicious header byte 0: 0x%02x\n", + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "Suspicious header byte 0: 0x%02x\n", msg->data[0]); } sh->rxmsg_bytes_missing = msg->data[0] << 8; sh->rxmsg_bytes_missing += msg->data[1]; if (sh->rxmsg_bytes_missing < CRAPD_HDR_LEN -2) { - LOGP(DLMI, LOGL_ERROR, - "Invalid length in hdr: %u\n", + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "Invalid length in hdr: %u\n", sh->rxmsg_bytes_missing); } } @@ -158,8 +157,8 @@ /* try to read as many of the missing bytes as are available */ rc = read(bfd->fd, msg->tail, sh->rxmsg_bytes_missing); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: error reading from " - "serial port: %s", strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: error reading from serial port: %s", + strerror(errno)); msgb_free(msg); return rc; } @@ -167,7 +166,6 @@ sh->rxmsg_bytes_missing -= rc; if (sh->rxmsg_bytes_missing == 0) { - struct e1inp_ts *e1i_ts = &sh->line->ts[0]; /* we have one complete message now */ sh->rx_msg = NULL; @@ -175,15 +173,13 @@ if (msg->len > CRAPD_HDR_LEN) msg->l2h = msg->data + CRAPD_HDR_LEN; - DEBUGP(DLMI, "rs232 RX: %s", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "rs232 RX: %s", osmo_hexdump(msg->data, msg->len)); /* don't use e1inp_tx_ts() here, this header does not * contain any SAPI and TEI values. */ if (!e1i_ts->line->ops->sign_link) { - LOGP(DLMI, LOGL_ERROR, "rs232: no callback set, " - "skipping message.\n"); - return -EINVAL; + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: no callback set, skipping message.\n"); + return -EINVAL; } e1i_ts->line->ops->sign_link(msg); } @@ -226,8 +222,7 @@ rc = open(serial_port, O_RDWR); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: cannot open serial port: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: cannot open serial port: %s", strerror(errno)); return rc; } bfd->fd = rc; @@ -235,8 +230,7 @@ /* set baudrate */ rc = tcgetattr(bfd->fd, &tio); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: tcgetattr says: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: tcgetattr says: %s", strerror(errno)); return rc; } cfsetispeed(&tio, B19200); @@ -249,16 +243,14 @@ tio.c_oflag &= ~(OPOST); rc = tcsetattr(bfd->fd, TCSADRAIN, &tio); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: tcsetattr says: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: tcsetattr says: %s", strerror(errno)); return rc; } ser_handle = talloc_zero(tall_rs232_ctx, struct serial_handle); if (ser_handle == NULL) { close(bfd->fd); - LOGP(DLMI, LOGL_ERROR, "rs232: cannot allocate memory for " - "serial handler\n"); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: cannot allocate memory for serial handler\n"); return -ENOMEM; } ser_handle->line = line; @@ -271,8 +263,7 @@ rc = osmo_fd_register(bfd); if (rc < 0) { close(bfd->fd); - LOGP(DLMI, LOGL_ERROR, "rs232: could not register FD: %s\n", - strerror(-rc)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: could not register FD: %s\n", strerror(-rc)); return rc; } diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index bc4b357..1d25ddf 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -58,15 +58,13 @@ { struct e1inp_line *line = bfd->data; - LOGP(DLINP, LOGL_ERROR, - "Socket connection failure, reconnecting... (line=%p, fd=%d)\n", - line, bfd->fd); + LOGPIL(line, DLINP, LOGL_ERROR, "Socket connection failure, reconnecting... (line=%p, fd=%d)\n", + line, bfd->fd); /* Unregister faulty file descriptor from select loop */ if(osmo_fd_is_registered(bfd)) { - LOGP(DLINP, LOGL_DEBUG, - "removing inactive socket from select loop... (line=%p, fd=%d)\n", - line, bfd->fd); + LOGPIL(line, DLINP, LOGL_DEBUG, "removing inactive socket from select loop... (line=%p, fd=%d)\n", + line, bfd->fd); osmo_fd_unregister(bfd); } @@ -98,22 +96,21 @@ goto fail; } else if (ret < 2) { /* packet must be at least 2 byte long to hold version + control/data header */ - LOGP(DLMI, LOGL_ERROR, "received to small packet: %d < 2", ret); + LOGPIL(line, DLMI, LOGL_ERROR, "received to small packet: %d < 2", ret); ret = -1; goto fail; } msgb_put(msg, ret); - LOGP(DLMI, LOGL_DEBUG, "rx msg: %s (fd=%d)\n", - osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); + LOGPIL(line, DLMI, LOGL_DEBUG, "rx msg: %s (fd=%d)\n", osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); /* check version header */ version = msgb_pull_u8(msg); controldata = msgb_pull_u8(msg); if (version != UNIXSOCKET_PROTO_VERSION) { - LOGP(DLMI, LOGL_ERROR, "received message with invalid version %d. valid: %d", - ret, UNIXSOCKET_PROTO_VERSION); + LOGPIL(line, DLMI, LOGL_ERROR, "received message with invalid version %d. valid: %d", + ret, UNIXSOCKET_PROTO_VERSION); ret = -1; goto fail; } @@ -122,11 +119,11 @@ case UNIXSOCKET_PROTO_DATA: return e1inp_rx_ts_lapd(&line->ts[0], msg); case UNIXSOCKET_PROTO_CONTROL: - LOGP(DLMI, LOGL_ERROR, "received (invalid) control message."); + LOGPIL(line, DLMI, LOGL_ERROR, "received (invalid) control message."); ret = -1; break; default: - LOGP(DLMI, LOGL_ERROR, "received invalid message."); + LOGPIL(line, DLMI, LOGL_ERROR, "received invalid message."); ret = -1; break; } @@ -156,8 +153,7 @@ msg = e1inp_tx_ts(e1i_ts, &sign_link); if (!msg) { /* no message after tx delay timer */ - LOGP(DLINP, LOGL_INFO, - "no message available (line=%p)\n", line); + LOGPITS(e1i_ts, DLINP, LOGL_INFO, "no message available (line=%p)\n", line); return 0; } @@ -166,8 +162,7 @@ osmo_timer_schedule(&e1i_ts->sign.tx_timer, 0, e1i_ts->sign.delay); - LOGP(DLINP, LOGL_DEBUG, "sending: %s (line=%p)\n", - msgb_hexdump(msg), line); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "sending: %s (line=%p)\n", msgb_hexdump(msg), line); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); @@ -195,18 +190,20 @@ return 0; } -static void unixsocket_write_msg(struct msgb *msg, struct osmo_fd *bfd) { +static void unixsocket_write_msg(struct msgb *msg, struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; int ret; - LOGP(DLMI, LOGL_DEBUG, "tx msg: %s (fd=%d)\n", - osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); + LOGPIL(line, DLMI, LOGL_DEBUG, "tx msg: %s (fd=%d)\n", + osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); if (ret == -1) unixsocket_exception_cb(bfd); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPIL(line, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } /*! @@ -234,14 +231,13 @@ int ret = 0; int i; - LOGP(DLINP, LOGL_NOTICE, "line update (line=%p)\n", line); + LOGPIL(line, DLINP, LOGL_NOTICE, "line update (line=%p)\n", line); if (!line->driver_data) line->driver_data = talloc_zero(line, struct unixsocket_line); if (!line->driver_data) { - LOGP(DLINP, LOGL_ERROR, - "OOM in line update (line=%p)\n", line); + LOGPIL(line, DLINP, LOGL_ERROR, "OOM in line update (line=%p)\n", line); return -ENOMEM; } @@ -255,10 +251,10 @@ ret = snprintf(un.sun_path, sizeof(un.sun_path), "%s%d", UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); if (ret == -1) { - LOGP(DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); return -errno; } else if (ret >= sizeof(un.sun_path)) { - LOGP(DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", + LOGPIL(line, DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", sizeof(un.sun_path), UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); return -ENOSPC; } @@ -272,21 +268,18 @@ * opening the socket fails. The caller may want to call this * function multiple times using config->fd.data as line * parameter. Freeing now would destroy that reference. */ - LOGP(DLINP, LOGL_ERROR, - "unable to open socket: %s (line=%p, fd=%d)\n", sock_path, - line, config->fd.fd); + LOGPIL(line, DLINP, LOGL_ERROR, "unable to open socket: %s (line=%p, fd=%d)\n", sock_path, + line, config->fd.fd); return ret; } - LOGP(DLINP, LOGL_DEBUG, - "successfully opend (new) socket: %s (line=%p, fd=%d, ret=%d)\n", - sock_path, line, config->fd.fd, ret); + LOGPIL(line, DLINP, LOGL_DEBUG, "successfully opend (new) socket: %s (line=%p, fd=%d, ret=%d)\n", + sock_path, line, config->fd.fd, ret); config->fd.fd = ret; /* Register socket in select loop */ if (osmo_fd_register(&config->fd) < 0) { - LOGP(DLINP, LOGL_ERROR, - "error registering new socket (line=%p, fd=%d)\n", - line, config->fd.fd); + LOGPIL(line, DLINP, LOGL_ERROR, "error registering new socket (line=%p, fd=%d)\n", + line, config->fd.fd); close(config->fd.fd); return -EIO; } @@ -330,13 +323,13 @@ return; if (unixline->driver != &unixsocket_driver) { - LOGP(DLMI, LOGL_NOTICE, "altc is only supported by unixsocket\n"); + LOGPIL(unixline, DLMI, LOGL_NOTICE, "altc is only supported by unixsocket\n"); return; } config = unixline->driver_data; if (!config) { - LOGP(DLMI, LOGL_NOTICE, "e1inp driver not yet initialized.\n"); + LOGPIL(unixline, DLMI, LOGL_NOTICE, "e1inp driver not yet initialized.\n"); return; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I447a2360757fed97ed50f9db1e2efbf2f90e46a0 Gerrit-Change-Number: 16818 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:40 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't use perror() directly, use osmocom logging instead References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16819 ) Change subject: e1d: Don't use perror() directly, use osmocom logging instead ...................................................................... e1d: Don't use perror() directly, use osmocom logging instead Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 --- M src/input/e1d.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/19/16819/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index ceeb0c2..787bf49 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -66,13 +66,13 @@ ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16); if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret); if (ret <= 1) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 Gerrit-Change-Number: 16819 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove EXCEPTFD handling References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16820 ) Change subject: e1d: Remove EXCEPTFD handling ...................................................................... e1d: Remove EXCEPTFD handling The file decscriptor 'except' handling was only added in the DAHDI input module as the DAHDI kernel side is actually using those. I don't think we can even use this in any way over unix domain sockets. Change-Id: I718629179181a1de3b82e23447549f593046d91f --- M src/input/e1d.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/20/16820/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 787bf49..bbbf8d5 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -144,8 +144,6 @@ switch (e1i_ts->type) { case E1INP_TS_TYPE_SIGN: - //if (what & BSC_FD_EXCEPT) - //FIXME: what to do ?!?! if (what & BSC_FD_READ) ret = handle_ts_sign_read(bfd); if (what & BSC_FD_WRITE) @@ -221,7 +219,7 @@ "Could not open timeslot %d\n", ts); return -EIO; } - bfd->when = BSC_FD_READ | BSC_FD_EXCEPT; + bfd->when = BSC_FD_READ; if (!e1i_ts->lapd) e1i_ts->lapd = lapd_instance_alloc(1, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I718629179181a1de3b82e23447549f593046d91f Gerrit-Change-Number: 16820 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove bogus vty_show function. References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16821 ) Change subject: e1d: Remove bogus vty_show function. ...................................................................... e1d: Remove bogus vty_show function. It's optional for an input driver to provide this function, and e.g. mISDN doesn't provide it, either. Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 --- M src/input/e1d.c 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/21/16821/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index bbbf8d5..c15c081 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -246,19 +246,10 @@ return 0; } -static void -e1d_vty_show(struct vty *vty, struct e1inp_line *line) -{ - /* FIXME */ - vty_out(vty, "Not supported yet%s", VTY_NEWLINE); -} - - struct e1inp_driver e1d_driver = { .name = "e1d", .want_write = e1d_want_write, .line_update = e1d_line_update, - .vty_show = e1d_vty_show, }; int -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 Gerrit-Change-Number: 16821 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:42 +0000 Subject: Change in libosmo-abis[master]: e1d: Use line->port_nr to specify e1d interface/line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16822 ) Change subject: e1d: Use line->port_nr to specify e1d interface/line ...................................................................... e1d: Use line->port_nr to specify e1d interface/line This way we can support more than one E1 line via osmo-e1d. As neither mISDN nor DAHDI distinguish between mutliple cards of single ports vs. multi-port cards, we havee to map both interface + line number into a single uint8_t. Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 --- M src/input/e1d.c 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/22/16822/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index c15c081..e111d14 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -179,11 +179,17 @@ int ts; int ret; + /* we use higher 4 bits for interface, lower 4 bits for line, + * resulting in max. 16 interfaces with 16 lines each */ + uint8_t e1d_intf = (line->port_nr >> 4) & 0xF; + uint8_t e1d_line = line->port_nr & 0xF; + if (line->driver != &e1d_driver) return -EINVAL; - LOGP(DLINP, LOGL_ERROR, "Line update %d %d %d\n", line->num, line->port_nr, line->num_ts); + LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + e1d_intf, e1d_line, line->num_ts); for (ts=1; tsnum_ts; ts++) { @@ -212,8 +218,10 @@ } continue; case E1INP_TS_TYPE_SIGN: - if (bfd->fd <= 0) - bfd->fd = osmo_e1dp_client_ts_open(g_e1d, 0, 0, ts, E1DP_TSMODE_HDLCFCS); + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_HDLCFCS); + } if (bfd->fd < 0) { LOGP(DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 Gerrit-Change-Number: 16822 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:42 +0000 Subject: Change in libosmo-abis[master]: e1d: Use LOGPIL/LOGPITS logging macros to give context References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16823 ) Change subject: e1d: Use LOGPIL/LOGPITS logging macros to give context ...................................................................... e1d: Use LOGPIL/LOGPITS logging macros to give context Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 --- M src/input/e1d.c 1 file changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/16823/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index e111d14..2b67141 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -66,13 +66,13 @@ ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16); if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret); if (ret <= 1) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -130,7 +130,7 @@ ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int @@ -150,8 +150,7 @@ ret = handle_ts_sign_write(bfd); break; default: - LOGP(DLINP, LOGL_NOTICE, - "unknown/unsupported E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type); break; } @@ -164,7 +163,7 @@ { /* We never include the DAHDI B-Channel FD into the writeset */ if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { - LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -188,7 +187,7 @@ return -EINVAL; - LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); for (ts=1; tsnum_ts; ts++) @@ -223,8 +222,7 @@ E1DP_TSMODE_HDLCFCS); } if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, - "Could not open timeslot %d\n", ts); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); return -EIO; } bfd->when = BSC_FD_READ; @@ -244,9 +242,7 @@ ret = osmo_fd_register(bfd); if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, - "could not register FD: %s\n", - strerror(ret)); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); return ret; } } @@ -266,7 +262,7 @@ /* Connect to daemon */ g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); if (!g_e1d) { - LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); + LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); return -EPIPE; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 Gerrit-Change-Number: 16823 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:42 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16824 ) Change subject: e1d: Don't connect to e1d at program start time ...................................................................... e1d: Don't connect to e1d at program start time Let's not print an error at program/library start time if osmo-e1d cannot be reached. This error is confusing to everyone who may have a libosmo-abis with e1d support compiled in, but who is not (currently) using any lines via this driver, but others drivers. Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 --- M src/input/e1d.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/24/16824/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 2b67141..c32e330 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -186,6 +186,14 @@ if (line->driver != &e1d_driver) return -EINVAL; + if (!g_e1d) { + /* Connect to daemon */ + g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); + if (!g_e1d) { + LOGPIL(line, DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); + return -EPIPE; + } + } LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); @@ -259,13 +267,6 @@ int e1inp_e1d_init(void) { - /* Connect to daemon */ - g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); - if (!g_e1d) { - LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); - return -EPIPE; - } - /* register the driver with the core */ return e1inp_driver_register(&e1d_driver); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 Gerrit-Change-Number: 16824 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:52:42 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16825 ) Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... e1d: Implement varions non-LAPD timeslot modes So far, the e1d input driver only contained code for LAPD signaling slots, let's extend it with support for all the other slot types, as well as support for run-time re-configuration. Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a --- M src/input/e1d.c 1 file changed, 56 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/16825/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index c32e330..2f129f5 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -182,6 +182,8 @@ * resulting in max. 16 interfaces with 16 lines each */ uint8_t e1d_intf = (line->port_nr >> 4) & 0xF; uint8_t e1d_line = line->port_nr & 0xF; + struct osmo_e1dp_ts_info *ts_info; + int num_ts_info; if (line->driver != &e1d_driver) return -EINVAL; @@ -198,6 +200,12 @@ LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); + ret = osmo_e1dp_client_ts_query(g_e1d, &ts_info, &num_ts_info, e1d_intf, e1d_line, 0); + if (ret < 0) { + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot query E1D for timeslot information: %d\n", ret); + return -EIO; + } + for (ts=1; tsnum_ts; ts++) { unsigned int idx = ts-1; @@ -212,6 +220,12 @@ bfd->priv_nr = ts; bfd->cb = e1d_fd_cb; + if (e1i_ts->type != E1INP_TS_TYPE_NONE && ts >= num_ts_info) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Timeslot configured, but not existant " + "on E1D side; skipping\n"); + continue; + } + switch (e1i_ts->type) { case E1INP_TS_TYPE_NONE: /* close/release LAPD instance, if any */ @@ -225,6 +239,10 @@ } continue; case E1INP_TS_TYPE_SIGN: + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { + close(bfd->fd); + bfd->fd = 0; + } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, E1DP_TSMODE_HDLCFCS); @@ -241,10 +259,47 @@ e1i_ts, &lapd_profile_abis); break; case E1INP_TS_TYPE_HDLC: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + /* close, if old timeslot mode doesn't match new config */ + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { + close(bfd->fd); + bfd->fd = 0; + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_HDLCFCS); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + return -EIO; + } + bfd->when = BSC_FD_READ; break; case E1INP_TS_TYPE_TRAU: - break; case E1INP_TS_TYPE_RAW: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + /* close, if old timeslot mode doesn't match new config */ + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_RAW) { + close(bfd->fd); + bfd->fd = 0; + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_RAW); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + return -EIO; + } + bfd->when = BSC_FD_READ; break; }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:55:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:55:24 +0000 Subject: Change in libosmo-abis[master]: dahdi: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16817 ) Change subject: dahdi: Don't use perror() directly, use osmocom logging instead ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I287e10ee49a8ac26eef903568b29a3b2abf3b43e Gerrit-Change-Number: 16817 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:55:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:56:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:56:03 +0000 Subject: Change in libosmo-abis[master]: introduce and use logging macros with context on E1 line / timeslot In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16818 ) Change subject: introduce and use logging macros with context on E1 line / timeslot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I447a2360757fed97ed50f9db1e2efbf2f90e46a0 Gerrit-Change-Number: 16818 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:56:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:56:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:56:09 +0000 Subject: Change in libosmo-abis[master]: [hack] e1d support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14867 ) Change subject: [hack] e1d support ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Gerrit-Change-Number: 14867 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 12:56:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:56:13 +0000 Subject: Change in libosmo-abis[master]: Use HAVE_E1D in C source, not ENABLE_E1D In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14868 ) Change subject: Use HAVE_E1D in C source, not ENABLE_E1D ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 Gerrit-Change-Number: 14868 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:56:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:56:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:56:19 +0000 Subject: Change in libosmo-abis[master]: add missing forward-declaration of e1inp_e1d_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14869 ) Change subject: add missing forward-declaration of e1inp_e1d_init() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd Gerrit-Change-Number: 14869 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:56:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:57:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:57:58 +0000 Subject: Change in libosmo-abis[master]: dahdi: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16817 ) Change subject: dahdi: Don't use perror() directly, use osmocom logging instead ...................................................................... dahdi: Don't use perror() directly, use osmocom logging instead Change-Id: I287e10ee49a8ac26eef903568b29a3b2abf3b43e --- M src/input/dahdi.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 5da0a2d..4d01fe0 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -181,11 +181,13 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } return e1inp_rx_ts_lapd(e1i_ts, msg); @@ -294,11 +296,13 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + return ret; } return e1inp_rx_ts(e1i_ts, msg, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I287e10ee49a8ac26eef903568b29a3b2abf3b43e Gerrit-Change-Number: 16817 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:57:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:57:58 +0000 Subject: Change in libosmo-abis[master]: introduce and use logging macros with context on E1 line / timeslot In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16818 ) Change subject: introduce and use logging macros with context on E1 line / timeslot ...................................................................... introduce and use logging macros with context on E1 line / timeslot Change-Id: I447a2360757fed97ed50f9db1e2efbf2f90e46a0 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/dahdi.c M src/input/misdn.c M src/input/rs232.c M src/input/unixsocket.c 6 files changed, 123 insertions(+), 155 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index e6d5154..de1c504 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -14,6 +14,12 @@ #define NUM_E1_TS 32 #define E1INP_USE_DEFAULT (-1) +#define LOGPITS(e1ts, ss, level, fmt, args ...) \ + LOGP(ss, level, "E1TS(%u:%u) " fmt, (e1ts)->line->num, (e1ts)->num, ## args) + +#define LOGPIL(e1l, ss, level, fmt, args ...) \ + LOGP(ss, level, "E1L(%u) " fmt, (e1l)->num, ## args) + enum e1inp_sign_type { E1INP_SIGN_NONE, E1INP_SIGN_OML, diff --git a/src/e1_input.c b/src/e1_input.c index 9e2f7b0..a707438 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -354,8 +354,7 @@ line = e1inp_line_find(e1_nr); if (line) { - LOGP(DLINP, LOGL_ERROR, "E1 Line %u already exists\n", - e1_nr); + LOGPIL(line, DLINP, LOGL_ERROR, "E1 Line %u already exists\n", e1_nr); return NULL; } @@ -375,7 +374,7 @@ line->rate_ctr = rate_ctr_group_alloc(line, &e1inp_ctr_g_d, line->num); if (!line->rate_ctr) { - LOGP(DLINP, LOGL_ERROR, "Cannot allocate counter group\n"); + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot allocate counter group\n"); talloc_free(line); return NULL; } @@ -429,7 +428,7 @@ { int old_refcnt = line->refcnt++; - LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", + LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", line->name, line, old_refcnt, line->refcnt); } @@ -437,7 +436,7 @@ { int old_refcnt = line->refcnt--; - LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", + LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", line->name, line, old_refcnt, line->refcnt); if (line->refcnt == 0) { @@ -598,13 +597,13 @@ /* consult the list of signalling links */ link = e1inp_lookup_sign_link(ts, tei, sapi); if (!link) { - LOGP(DLMI, LOGL_ERROR, "didn't find signalling link for " + LOGPITS(ts, DLMI, LOGL_ERROR, "didn't find signalling link for " "tei %d, sapi %d\n", tei, sapi); msgb_free(msg); return -EINVAL; } if (!ts->line->ops->sign_link) { - LOGP(DLINP, LOGL_ERROR, "Fix your application, " + LOGPITS(ts, DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); msgb_free(msg); return -ENOENT; @@ -624,7 +623,7 @@ break; default: ret = -EINVAL; - LOGP(DLMI, LOGL_ERROR, "unknown TS type %u\n", ts->type); + LOGPITS(ts, DLMI, LOGL_ERROR, "unknown TS type %u\n", ts->type); msgb_free(msg); break; } @@ -652,7 +651,7 @@ else tei = msg->data[1] >> 1; - DEBUGP(DLMI, "<= len = %d, sapi(%d) tei(%d)\n", msg->len, sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "<= len = %d, sapi(%d) tei(%d)\n", msg->len, sapi, tei); ret = lapd_receive(e1i_ts->lapd, msg, &error); if (ret < 0) { @@ -679,18 +678,18 @@ switch (dp->oph.primitive) { case PRIM_DL_EST: - DEBUGP(DLMI, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_EST: sapi(%d) tei(%d)\n", sapi, tei); e1inp_event(e1i_ts, S_L_INP_TEI_UP, tei, sapi); break; case PRIM_DL_REL: - DEBUGP(DLMI, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_REL: sapi(%d) tei(%d)\n", sapi, tei); e1inp_event(e1i_ts, S_L_INP_TEI_DN, tei, sapi); break; case PRIM_DL_DATA: case PRIM_DL_UNIT_DATA: if (dp->oph.operation == PRIM_OP_INDICATION) { msg->l2h = msg->l3h; - DEBUGP(DLMI, "RX: %s sapi=%d tei=%d\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s sapi=%d tei=%d\n", osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)), sapi, tei); e1inp_rx_ts(e1i_ts, msg, tei, sapi); @@ -698,7 +697,7 @@ } break; case PRIM_MDL_ERROR: - DEBUGP(DLMI, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "MDL_EERROR: cause(%d)\n", dp->u.error_ind.cause); break; default: printf("ERROR: unknown prim\n"); @@ -738,8 +737,7 @@ return NULL; len = subchan_mux_out(&e1i_ts->trau.mux, msg->data, 40); if (len != 40) { - LOGP(DLMI, LOGL_ERROR, - "cannot transmit, failed to mux\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "cannot transmit, failed to mux\n"); msgb_free(msg); return NULL; } @@ -754,7 +752,7 @@ msg = msgb_dequeue(&e1i_ts->hdlc.tx_queue); break; default: - LOGP(DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", e1i_ts->type); return NULL; } return msg; diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 4d01fe0..6da1a02 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -134,7 +134,7 @@ if (rc < 0) return; - LOGP(DLMI, LOGL_NOTICE, "Line %u(%s) / TS %u DAHDI EVENT %s\n", + LOGPITS(ts, DLMI, LOGL_NOTICE, "Line %u(%s) / TS %u DAHDI EVENT %s\n", ts->line->num, ts->line->name, ts->num, get_value_string(dahdi_evt_names, evt)); @@ -181,12 +181,12 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -199,7 +199,7 @@ * writeset, since it doesn't support poll() based * write flow control */ if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { - LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -229,7 +229,7 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int handle_ts1_write(struct osmo_fd *bfd) @@ -249,7 +249,7 @@ return 0; } - DEBUGP(DLMI, "TX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "TX: %s\n", osmo_hexdump(msg->data, msg->len)); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); @@ -278,7 +278,7 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int handle_hdlc_read(struct osmo_fd *bfd) @@ -296,12 +296,12 @@ if (ret == -1) handle_dahdi_exception(e1i_ts); else if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret - 2); if (ret <= 3) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -351,13 +351,12 @@ ret = subchan_mux_out(mx, tx_buf, D_BCHAN_TX_GRAN); if (ret != D_BCHAN_TX_GRAN) { - LOGP(DLINP, LOGL_DEBUG, "Huh, got ret of %d\n", ret); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Huh, got ret of %d\n", ret); if (ret < 0) return ret; } - DEBUGP(DLMIB, "BCHAN TX: %s\n", - osmo_hexdump(tx_buf, D_BCHAN_TX_GRAN)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN TX: %s\n", osmo_hexdump(tx_buf, D_BCHAN_TX_GRAN)); if (invertbits) { flip_buf_bits(tx_buf, ret); @@ -365,7 +364,7 @@ ret = write(bfd->fd, tx_buf, ret); if (ret < D_BCHAN_TX_GRAN) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, D_BCHAN_TX_GRAN); return ret; @@ -386,8 +385,7 @@ ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE); if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { - LOGP(DLINP, LOGL_DEBUG, "read error %d %s\n", - ret, strerror(errno)); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno)); return ret; } @@ -398,8 +396,7 @@ msgb_put(msg, ret); msg->l2h = msg->data; - DEBUGP(DLMIB, "BCHAN RX: %s\n", - osmo_hexdump(msgb_l2(msg), ret)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret)); ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); /* physical layer indicates that data has been sent, * we thus can send some more data */ @@ -426,12 +423,11 @@ /* This might lead to a transmit underrun, as we call tx * from the rx path, as there's no select/poll on dahdi * */ - LOGP(DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " "expected %u\n", msg->len, D_BCHAN_TX_GRAN); } - DEBUGP(DLMIB, "RAW CHAN TX: %s\n", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); if (0/*invertbits*/) { flip_buf_bits(msg->data, msg->len); @@ -439,8 +435,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < msg->len) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", - ret, msg->len); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); msgb_free(msg); return ret; @@ -459,8 +454,7 @@ ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE); if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { - LOGP(DLINP, LOGL_DEBUG, "read error %d %s\n", - ret, strerror(errno)); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno)); return ret; } @@ -471,8 +465,7 @@ msgb_put(msg, ret); msg->l2h = msg->data; - DEBUGP(DLMIB, "RAW CHAN RX: %s\n", - osmo_hexdump(msgb_l2(msg), ret)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret)); ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); /* physical layer indicates that data has been sent, * we thus can send some more data */ @@ -530,8 +523,7 @@ * write flow control */ break; default: - LOGP(DLINP, LOGL_NOTICE, - "unknown E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown E1 TS type %u\n", e1i_ts->type); break; } @@ -641,9 +633,8 @@ scfg = span_cfgs[line->port_nr]; if (!scfg) { - LOGP(DLMI, LOGL_ERROR, "Line %u(%s): DAHDI Port %u (Span %u) " - "doesn't exist\n", line->num, line->name, line->port_nr, - line->port_nr+1); + LOGPIL(line, DLMI, LOGL_ERROR, "Line %u(%s): DAHDI Port %u (Span %u) doesn't exist\n", + line->num, line->name, line->port_nr, line->port_nr+1); return -EIO; } @@ -733,9 +724,7 @@ ret = osmo_fd_register(bfd); if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, - "could not register FD: %s\n", - strerror(ret)); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); return ret; } } diff --git a/src/input/misdn.c b/src/input/misdn.c index bdca9d5..fef1c0f 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -124,21 +124,21 @@ msgb_put(msg, ret); - DEBUGP(DLMI, "alen =%d, dev(%d) channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "alen =%d, dev(%d) channel(%d) sapi(%d) tei(%d)\n", alen, l2addr.dev, l2addr.channel, l2addr.sapi, l2addr.tei); - DEBUGP(DLMI, "<= len = %d, prim(0x%x) id(0x%x): %s\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "<= len = %d, prim(0x%x) id(0x%x): %s\n", ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case DL_INFORMATION_IND: /* mISDN tells us which channel number is allocated for this * tuple of (SAPI, TEI). */ - DEBUGP(DLMI, "DL_INFORMATION_IND: use channel(%d) sapi(%d) tei(%d) for now\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_INFORMATION_IND: use channel(%d) sapi(%d) tei(%d) for now\n", l2addr.channel, l2addr.sapi, l2addr.tei); link = e1inp_lookup_sign_link(e1i_ts, l2addr.tei, l2addr.sapi); if (!link) { - DEBUGPC(DLMI, "mISDN message for unknown sign_link\n"); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "mISDN message for unknown sign_link\n"); msgb_free(msg); return -EINVAL; } @@ -147,14 +147,14 @@ msgb_free(msg); break; case DL_ESTABLISH_IND: - DEBUGP(DLMI, "DL_ESTABLISH_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_ESTABLISH_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); /* For some strange reason, sometimes the DL_INFORMATION_IND tells * us the wrong channel, and we only get the real channel number * during the DL_ESTABLISH_IND */ link = e1inp_lookup_sign_link(e1i_ts, l2addr.tei, l2addr.sapi); if (!link) { - DEBUGPC(DLMI, "mISDN message for unknown sign_link\n"); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "mISDN message for unknown sign_link\n"); msgb_free(msg); return -EINVAL; } @@ -164,7 +164,7 @@ msgb_free(msg); break; case DL_RELEASE_IND: - DEBUGP(DLMI, "DL_RELEASE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "DL_RELEASE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); ret = e1inp_event(e1i_ts, S_L_INP_TEI_DN, l2addr.tei, l2addr.sapi); msgb_free(msg); @@ -172,33 +172,33 @@ case DL_DATA_IND: case DL_UNITDATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMI, "RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); if (mline->use_userspace_lapd) { - LOGP(DLMI, LOGL_ERROR, "DL_DATA_IND but userspace LAPD ?!?\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "DL_DATA_IND but userspace LAPD ?!?\n"); msgb_free(msg); return -EIO; } ret = e1inp_rx_ts(e1i_ts, msg, l2addr.tei, l2addr.sapi); break; case PH_ACTIVATE_IND: - DEBUGP(DLMI, "PH_ACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_ACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); msgb_free(msg); break; case PH_DEACTIVATE_IND: - DEBUGP(DLMI, "PH_DEACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_DEACTIVATE_IND: channel(%d) sapi(%d) tei(%d)\n", l2addr.channel, l2addr.sapi, l2addr.tei); msgb_free(msg); break; case PH_DATA_IND: if (!mline->use_userspace_lapd) { - LOGP(DLMI, LOGL_ERROR, "PH_DATA_IND but kernel LAPD ?!?\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "PH_DATA_IND but kernel LAPD ?!?\n"); return -EIO; } /* remove the Misdn Header */ msgb_pull(msg, MISDN_HEADER_LEN); /* hand into the LAPD code */ - DEBUGP(DLMI, "RX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "RX: %s\n", osmo_hexdump(msg->data, msg->len)); ret = e1inp_rx_ts_lapd(e1i_ts, msg); break; default: @@ -252,9 +252,8 @@ } if (mline->use_userspace_lapd) { - DEBUGP(DLMI, "TX %u/%u/%u: %s\n", - line->num, sign_link->tei, sign_link->sapi, - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX %u/%u/%u: %s\n", line->num, sign_link->tei, + sign_link->sapi, osmo_hexdump(msg->data, msg->len)); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); ret = 0; @@ -265,7 +264,7 @@ hh = (struct mISDNhead *) msgb_push(msg, sizeof(*hh)); hh->prim = DL_DATA_REQ; - DEBUGP(DLMI, "TX channel(%d) TEI(%d) SAPI(%d): %s\n", + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX channel(%d) TEI(%d) SAPI(%d): %s\n", sign_link->driver.misdn.channel, sign_link->tei, sign_link->sapi, osmo_hexdump(l2_data, msg->len - MISDN_HEADER_LEN)); @@ -295,13 +294,13 @@ static void misdn_write_msg(struct msgb *msg, void *cbdata) { struct osmo_fd *bfd = cbdata; -// struct e1inp_line *line = bfd->data; -// unsigned int ts_nr = bfd->priv_nr; -// struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; struct mISDNhead *hh; int ret; - DEBUGP(DLMI, "PH_DATA_REQ: len=%d %s\n", msg->len, + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "PH_DATA_REQ: len=%d %s\n", msg->len, osmo_hexdump(msg->data, msg->len)); hh = (struct mISDNhead *) msgb_push(msg, MISDN_HEADER_LEN); @@ -310,7 +309,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "write failed %d\n", ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "write failed %d\n", ret); msgb_free(msg); } @@ -332,13 +331,11 @@ subchan_mux_out(mx, tx_buf+sizeof(*hh), len); - DEBUGP(DLMIB, "BCHAN TX: %s\n", - osmo_hexdump(tx_buf+sizeof(*hh), len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN TX: %s\n", osmo_hexdump(tx_buf+sizeof(*hh), len)); ret = send(bfd->fd, tx_buf, sizeof(*hh) + len, 0); if (ret < sizeof(*hh) + len) - DEBUGP(DLMIB, "send returns %d instead of %zu\n", ret, - sizeof(*hh) + len); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "send returns %d instead of %zu\n", ret, sizeof(*hh) + len); return ret; } @@ -368,14 +365,13 @@ msgb_put(msg, ret); if (hh->prim != PH_CONTROL_IND) - DEBUGP(DLMIB, "<= BCHAN len = %d, prim(0x%x) id(0x%x): %s\n", - ret, hh->prim, hh->id, - get_value_string(prim_names, hh->prim)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "<= BCHAN len = %d, prim(0x%x) id(0x%x): %s\n", + ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case PH_DATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMIB, "BCHAN RX: %s\n", + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "BCHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); /* the number of bytes received indicates that data to send */ handle_tsX_write(bfd, msgb_l2len(msg)); @@ -411,12 +407,10 @@ /* This might lead to a transmit underrun, as we call tx * from the rx path, as there's no select/poll on dahdi * */ - LOGP(DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " - "expected %u\n", msg->len, len); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, expected %u\n", msg->len, len); } - DEBUGP(DLMIB, "RAW CHAN TX: %s\n", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); hh = (struct mISDNhead *) msgb_push(msg, sizeof(*hh)); hh->prim = PH_DATA_REQ; @@ -424,8 +418,7 @@ ret = write(bfd->fd, msg->data, msg->len); if (ret < msg->len) - LOGP(DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", - ret, msg->len); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); msgb_free(msg); return ret; @@ -454,14 +447,13 @@ msgb_put(msg, ret); if (hh->prim != PH_CONTROL_IND) - DEBUGP(DLMIB, "<= RAW CHAN len = %d, prim(0x%x) id(0x%x): %s\n", - ret, hh->prim, hh->id, - get_value_string(prim_names, hh->prim)); + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "<= RAW CHAN len = %d, prim(0x%x) id(0x%x): %s\n", + ret, hh->prim, hh->id, get_value_string(prim_names, hh->prim)); switch (hh->prim) { case PH_DATA_IND: msg->l2h = msg->data + MISDN_HEADER_LEN; - DEBUGP(DLMIB, "RAW CHAN RX: %s\n", + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret - MISDN_HEADER_LEN)); /* the number of bytes received indicates that data to send */ handle_ts_raw_write(bfd, msgb_l2len(msg)); @@ -661,8 +653,7 @@ addr.channel = ts; break; default: - DEBUGP(DLMI, "unsupported E1 TS type: %u\n", - e1i_ts->type); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type: %u\n", e1i_ts->type); break; } @@ -724,7 +715,7 @@ close(sk); return -ENODEV; } - //DEBUGP(DLMI,"%d device%s found\n", cnt, (cnt==1)?"":"s"); + //LOGPIL(line, DLMI, LOGL_DEBUG, "%d device%s found\n", cnt, (cnt==1)?"":"s"); printf("%d device%s found\n", cnt, (cnt==1)?"":"s"); #if 1 devinfo.id = line->port_nr; diff --git a/src/input/rs232.c b/src/input/rs232.c index c801ab2..dfbf97c 100644 --- a/src/input/rs232.c +++ b/src/input/rs232.c @@ -94,14 +94,14 @@ /* no message after tx delay timer */ return 0; } - DEBUGP(DLMI, "rs232 TX: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "rs232 TX: %s\n", osmo_hexdump(msg->data, msg->len)); rs232_build_msg(msg); /* send over serial line */ written = write(bfd->fd, msg->data, msg->len); if (written < msg->len) { - LOGP(DLMI, LOGL_ERROR, "rs232: short write\n"); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: short write\n"); msgb_free(msg); return -1; } @@ -118,6 +118,7 @@ static int handle_ser_read(struct osmo_fd *bfd) { struct serial_handle *sh = bfd->data; + struct e1inp_ts *e1i_ts = &sh->line->ts[0]; struct msgb *msg; int rc = 0; @@ -131,7 +132,7 @@ if (msg->len < 2) { rc = read(bfd->fd, msg->tail, 2 - msg->len); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: error reading from " + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: error reading from " "serial port: %s\n", strerror(errno)); msgb_free(msg); return rc; @@ -141,16 +142,14 @@ if (msg->len >= 2) { /* parse CRAPD payload length */ if (msg->data[0] != 0) { - LOGP(DLMI, LOGL_ERROR, - "Suspicious header byte 0: 0x%02x\n", + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "Suspicious header byte 0: 0x%02x\n", msg->data[0]); } sh->rxmsg_bytes_missing = msg->data[0] << 8; sh->rxmsg_bytes_missing += msg->data[1]; if (sh->rxmsg_bytes_missing < CRAPD_HDR_LEN -2) { - LOGP(DLMI, LOGL_ERROR, - "Invalid length in hdr: %u\n", + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "Invalid length in hdr: %u\n", sh->rxmsg_bytes_missing); } } @@ -158,8 +157,8 @@ /* try to read as many of the missing bytes as are available */ rc = read(bfd->fd, msg->tail, sh->rxmsg_bytes_missing); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: error reading from " - "serial port: %s", strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: error reading from serial port: %s", + strerror(errno)); msgb_free(msg); return rc; } @@ -167,7 +166,6 @@ sh->rxmsg_bytes_missing -= rc; if (sh->rxmsg_bytes_missing == 0) { - struct e1inp_ts *e1i_ts = &sh->line->ts[0]; /* we have one complete message now */ sh->rx_msg = NULL; @@ -175,15 +173,13 @@ if (msg->len > CRAPD_HDR_LEN) msg->l2h = msg->data + CRAPD_HDR_LEN; - DEBUGP(DLMI, "rs232 RX: %s", - osmo_hexdump(msg->data, msg->len)); + LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "rs232 RX: %s", osmo_hexdump(msg->data, msg->len)); /* don't use e1inp_tx_ts() here, this header does not * contain any SAPI and TEI values. */ if (!e1i_ts->line->ops->sign_link) { - LOGP(DLMI, LOGL_ERROR, "rs232: no callback set, " - "skipping message.\n"); - return -EINVAL; + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "rs232: no callback set, skipping message.\n"); + return -EINVAL; } e1i_ts->line->ops->sign_link(msg); } @@ -226,8 +222,7 @@ rc = open(serial_port, O_RDWR); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: cannot open serial port: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: cannot open serial port: %s", strerror(errno)); return rc; } bfd->fd = rc; @@ -235,8 +230,7 @@ /* set baudrate */ rc = tcgetattr(bfd->fd, &tio); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: tcgetattr says: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: tcgetattr says: %s", strerror(errno)); return rc; } cfsetispeed(&tio, B19200); @@ -249,16 +243,14 @@ tio.c_oflag &= ~(OPOST); rc = tcsetattr(bfd->fd, TCSADRAIN, &tio); if (rc < 0) { - LOGP(DLMI, LOGL_ERROR, "rs232: tcsetattr says: %s", - strerror(errno)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: tcsetattr says: %s", strerror(errno)); return rc; } ser_handle = talloc_zero(tall_rs232_ctx, struct serial_handle); if (ser_handle == NULL) { close(bfd->fd); - LOGP(DLMI, LOGL_ERROR, "rs232: cannot allocate memory for " - "serial handler\n"); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: cannot allocate memory for serial handler\n"); return -ENOMEM; } ser_handle->line = line; @@ -271,8 +263,7 @@ rc = osmo_fd_register(bfd); if (rc < 0) { close(bfd->fd); - LOGP(DLMI, LOGL_ERROR, "rs232: could not register FD: %s\n", - strerror(-rc)); + LOGPIL(line, DLMI, LOGL_ERROR, "rs232: could not register FD: %s\n", strerror(-rc)); return rc; } diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index bc4b357..1d25ddf 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -58,15 +58,13 @@ { struct e1inp_line *line = bfd->data; - LOGP(DLINP, LOGL_ERROR, - "Socket connection failure, reconnecting... (line=%p, fd=%d)\n", - line, bfd->fd); + LOGPIL(line, DLINP, LOGL_ERROR, "Socket connection failure, reconnecting... (line=%p, fd=%d)\n", + line, bfd->fd); /* Unregister faulty file descriptor from select loop */ if(osmo_fd_is_registered(bfd)) { - LOGP(DLINP, LOGL_DEBUG, - "removing inactive socket from select loop... (line=%p, fd=%d)\n", - line, bfd->fd); + LOGPIL(line, DLINP, LOGL_DEBUG, "removing inactive socket from select loop... (line=%p, fd=%d)\n", + line, bfd->fd); osmo_fd_unregister(bfd); } @@ -98,22 +96,21 @@ goto fail; } else if (ret < 2) { /* packet must be at least 2 byte long to hold version + control/data header */ - LOGP(DLMI, LOGL_ERROR, "received to small packet: %d < 2", ret); + LOGPIL(line, DLMI, LOGL_ERROR, "received to small packet: %d < 2", ret); ret = -1; goto fail; } msgb_put(msg, ret); - LOGP(DLMI, LOGL_DEBUG, "rx msg: %s (fd=%d)\n", - osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); + LOGPIL(line, DLMI, LOGL_DEBUG, "rx msg: %s (fd=%d)\n", osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); /* check version header */ version = msgb_pull_u8(msg); controldata = msgb_pull_u8(msg); if (version != UNIXSOCKET_PROTO_VERSION) { - LOGP(DLMI, LOGL_ERROR, "received message with invalid version %d. valid: %d", - ret, UNIXSOCKET_PROTO_VERSION); + LOGPIL(line, DLMI, LOGL_ERROR, "received message with invalid version %d. valid: %d", + ret, UNIXSOCKET_PROTO_VERSION); ret = -1; goto fail; } @@ -122,11 +119,11 @@ case UNIXSOCKET_PROTO_DATA: return e1inp_rx_ts_lapd(&line->ts[0], msg); case UNIXSOCKET_PROTO_CONTROL: - LOGP(DLMI, LOGL_ERROR, "received (invalid) control message."); + LOGPIL(line, DLMI, LOGL_ERROR, "received (invalid) control message."); ret = -1; break; default: - LOGP(DLMI, LOGL_ERROR, "received invalid message."); + LOGPIL(line, DLMI, LOGL_ERROR, "received invalid message."); ret = -1; break; } @@ -156,8 +153,7 @@ msg = e1inp_tx_ts(e1i_ts, &sign_link); if (!msg) { /* no message after tx delay timer */ - LOGP(DLINP, LOGL_INFO, - "no message available (line=%p)\n", line); + LOGPITS(e1i_ts, DLINP, LOGL_INFO, "no message available (line=%p)\n", line); return 0; } @@ -166,8 +162,7 @@ osmo_timer_schedule(&e1i_ts->sign.tx_timer, 0, e1i_ts->sign.delay); - LOGP(DLINP, LOGL_DEBUG, "sending: %s (line=%p)\n", - msgb_hexdump(msg), line); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "sending: %s (line=%p)\n", msgb_hexdump(msg), line); lapd_transmit(e1i_ts->lapd, sign_link->tei, sign_link->sapi, msg); @@ -195,18 +190,20 @@ return 0; } -static void unixsocket_write_msg(struct msgb *msg, struct osmo_fd *bfd) { +static void unixsocket_write_msg(struct msgb *msg, struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; int ret; - LOGP(DLMI, LOGL_DEBUG, "tx msg: %s (fd=%d)\n", - osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); + LOGPIL(line, DLMI, LOGL_DEBUG, "tx msg: %s (fd=%d)\n", + osmo_hexdump_nospc(msg->data, msg->len), bfd->fd); ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); if (ret == -1) unixsocket_exception_cb(bfd); else if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPIL(line, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } /*! @@ -234,14 +231,13 @@ int ret = 0; int i; - LOGP(DLINP, LOGL_NOTICE, "line update (line=%p)\n", line); + LOGPIL(line, DLINP, LOGL_NOTICE, "line update (line=%p)\n", line); if (!line->driver_data) line->driver_data = talloc_zero(line, struct unixsocket_line); if (!line->driver_data) { - LOGP(DLINP, LOGL_ERROR, - "OOM in line update (line=%p)\n", line); + LOGPIL(line, DLINP, LOGL_ERROR, "OOM in line update (line=%p)\n", line); return -ENOMEM; } @@ -255,10 +251,10 @@ ret = snprintf(un.sun_path, sizeof(un.sun_path), "%s%d", UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); if (ret == -1) { - LOGP(DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno)); return -errno; } else if (ret >= sizeof(un.sun_path)) { - LOGP(DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", + LOGPIL(line, DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n", sizeof(un.sun_path), UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); return -ENOSPC; } @@ -272,21 +268,18 @@ * opening the socket fails. The caller may want to call this * function multiple times using config->fd.data as line * parameter. Freeing now would destroy that reference. */ - LOGP(DLINP, LOGL_ERROR, - "unable to open socket: %s (line=%p, fd=%d)\n", sock_path, - line, config->fd.fd); + LOGPIL(line, DLINP, LOGL_ERROR, "unable to open socket: %s (line=%p, fd=%d)\n", sock_path, + line, config->fd.fd); return ret; } - LOGP(DLINP, LOGL_DEBUG, - "successfully opend (new) socket: %s (line=%p, fd=%d, ret=%d)\n", - sock_path, line, config->fd.fd, ret); + LOGPIL(line, DLINP, LOGL_DEBUG, "successfully opend (new) socket: %s (line=%p, fd=%d, ret=%d)\n", + sock_path, line, config->fd.fd, ret); config->fd.fd = ret; /* Register socket in select loop */ if (osmo_fd_register(&config->fd) < 0) { - LOGP(DLINP, LOGL_ERROR, - "error registering new socket (line=%p, fd=%d)\n", - line, config->fd.fd); + LOGPIL(line, DLINP, LOGL_ERROR, "error registering new socket (line=%p, fd=%d)\n", + line, config->fd.fd); close(config->fd.fd); return -EIO; } @@ -330,13 +323,13 @@ return; if (unixline->driver != &unixsocket_driver) { - LOGP(DLMI, LOGL_NOTICE, "altc is only supported by unixsocket\n"); + LOGPIL(unixline, DLMI, LOGL_NOTICE, "altc is only supported by unixsocket\n"); return; } config = unixline->driver_data; if (!config) { - LOGP(DLMI, LOGL_NOTICE, "e1inp driver not yet initialized.\n"); + LOGPIL(unixline, DLMI, LOGL_NOTICE, "e1inp driver not yet initialized.\n"); return; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I447a2360757fed97ed50f9db1e2efbf2f90e46a0 Gerrit-Change-Number: 16818 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:59:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:59:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 ) Change subject: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 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: Ib6004d2b23c8207faac7f8b7bd07e84c404cd84d Gerrit-Change-Number: 16811 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:59:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:59:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:59:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 ) Change subject: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 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: Ib00f1f89bf1484d8a8e07be8c0a1fc849bcf03a0 Gerrit-Change-Number: 16812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:59:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 12:59:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 12:59:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 ) Change subject: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 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: I38b47c3b382281d0e7a3d80d1630362096949b6f Gerrit-Change-Number: 16813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 12:59:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 ) Change subject: WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests ...................................................................... WIP: gen_links.sh + regen_makefile.sh for make SCCP_Tests Change-Id: Ib6004d2b23c8207faac7f8b7bd07e84c404cd84d --- A SCCP_Test/gen_links.sh A SCCP_Test/regen_makefile.sh 2 files changed, 55 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/SCCP_Test/gen_links.sh b/SCCP_Test/gen_links.sh new file mode 100755 index 0000000..c980844 --- /dev/null +++ b/SCCP_Test/gen_links.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# required by M3UA_Emulation +DIR=$BASEDIR/titan.ProtocolModules.M3UA/src +FILES="M3UA_Types.ttcn" +gen_links $DIR $FILES + +# required by M3UA_Emulation +DIR=$BASEDIR/titan.TestPorts.SCTPasp/src +FILES="SCTPasp_PT.cc SCTPasp_PT.hh SCTPasp_PortType.ttcn SCTPasp_Types.ttcn" +gen_links $DIR $FILES + +# required by SCCP Emulation +DIR=$BASEDIR/titan.ProtocolEmulations.M3UA/src +FILES="M3UA_Emulation.ttcn" +gen_links $DIR $FILES + +# required by SCCP Emulation +DIR=$BASEDIR/titan.TestPorts.MTP3asp/src +FILES="MTP3asp_PortType.ttcn MTP3asp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src +FILES="SCCP_Emulation.ttcn SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn +Native_Functions.ttcn Native_FunctionDefs.cc SCCP_Templates.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh new file mode 100755 index 0000000..9472e0c --- /dev/null +++ b/SCCP_Test/regen_makefile.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +MAIN=SCCP_Testcases.ttcn + +FILES="*.ttcn *.ttcnpp" + +../regen-makefile.sh $MAIN $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16811 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: Ib6004d2b23c8207faac7f8b7bd07e84c404cd84d Gerrit-Change-Number: 16811 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 ) Change subject: SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt ...................................................................... SCCP_Tests.default: Use "SccpDemoUser" as VTY prompt It seems that our TTCN3 VTY/Telnet module no longer supports '-' inside prompt. However, older sccp_demu_user programs in libosmo-sccp.git before Change-Id I4b6d7dd6fdf7521a4a9071e50ac1dcb2993c74bb use this. Let's adjust our expectation here to the new dash-less variant. Change-Id: Ib00f1f89bf1484d8a8e07be8c0a1fc849bcf03a0 --- M sccp/SCCP_Tests.default 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index 95e0d2f..f837664 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -16,7 +16,7 @@ *.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered" *.SCCP_DEMO_USER_VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" -*.SCCP_DEMO_USER_VTY.PROMPT1 := "sccp-demo-user> " +*.SCCP_DEMO_USER_VTY.PROMPT1 := "SccpDemoUser> " [MODULE_PARAMETERS] M3UA_Emulation.tsp_logVerbose := true; @@ -35,7 +35,7 @@ } }; -Osmocom_VTY_Functions.mp_prompt_prefix := "sccp-demo-user"; +Osmocom_VTY_Functions.mp_prompt_prefix := "SccpDemoUser"; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16812 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: Ib00f1f89bf1484d8a8e07be8c0a1fc849bcf03a0 Gerrit-Change-Number: 16812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 ) Change subject: deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP ...................................................................... deps: Switch to osmocom fork of titan.ProtocolEmulations.SCCP This allows us to use the ConvertPDUEncodedAddressToASPAddress() functions from outside SCCP_CT. See Change-Id I72351168d4e0e79cea3319a537d51d47027266f4 Change-Id: I38b47c3b382281d0e7a3d80d1630362096949b6f --- M deps/Makefile 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 5d263aa..d39cec2 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -57,14 +57,14 @@ titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ - titan.ProtocolEmulations.SCCP OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ titan.ProtocolModules.M3UA \ - titan.ProtocolEmulations.M3UA + titan.ProtocolEmulations.M3UA \ + titan.ProtocolEmulations.SCCP OSMOGIT_REPOS= titan.ProtocolModules.MAP \ titan.ProtocolModules.BSSMAP \ @@ -77,7 +77,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.30.A titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea -titan.ProtocolEmulations.SCCP_commit= R.7.A-2-g724c83f +titan.ProtocolEmulations.SCCP_commit= 9e70fba95bb3dfaf09f5f8260177401ef4cceda7 titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A titan.ProtocolModules.BSSMAP_commit= master -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16813 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: I38b47c3b382281d0e7a3d80d1630362096949b6f Gerrit-Change-Number: 16813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:03:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:03:49 +0000 Subject: Change in simtrace2[master]: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16803 ) Change subject: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a Gerrit-Change-Number: 16803 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 13:03:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:03:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:03:52 +0000 Subject: Change in simtrace2[master]: firmware: move printing of welcome banner to common function print_ba... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16802 ) Change subject: firmware: move printing of welcome banner to common function print_banner() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a Gerrit-Change-Number: 16802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 13:03:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:03:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:03:56 +0000 Subject: Change in simtrace2[master]: firmware: move printing of welcome banner to common function print_ba... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16802 ) Change subject: firmware: move printing of welcome banner to common function print_banner() ...................................................................... firmware: move printing of welcome banner to common function print_banner() This unifies the printing of the welcome banner, and it also ensures that all modes print all information (serial number, reset cause). Furthermore the APP and BOARD #defines from the make environment are also printed. Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a --- M firmware/Makefile M firmware/apps/cardem/main.c M firmware/apps/trace/main.c M firmware/apps/triple_play/main.c A firmware/libcommon/include/main_common.h A firmware/libcommon/source/main_common.c 6 files changed, 64 insertions(+), 60 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index bd634aa..5c7aa92 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -99,7 +99,8 @@ C_LIBUSB = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c C_LIBUSB_RT = dfu.c dfu_runtime.c C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c -C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c +C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c \ + main_common.c C_BOARD = $(notdir $(wildcard libboard/common/source/*.c)) C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 2f7bcd5..f6a5ab5 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -24,10 +24,9 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "main_common.h" #include -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -154,34 +153,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\n\r\n\r" - "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION "\n\r" - "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" - "=============================================================================\n\r"); - -#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) - TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos; - static const char* reset_causes[] = { - "general reset (first power-up reset)", - "backup reset (return from backup mode)", - "watchdog reset (watchdog fault occurred)", - "software reset (processor reset required by the software)", - "user reset (NRST pin detected low)", - }; - if (reset_cause < ARRAY_SIZE(reset_causes)) { - TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); - } else { - TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); - } -#endif - + print_banner(); board_main_top(); TRACE_INFO("USB init...\n\r"); diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c index 97455fb..08d6120 100644 --- a/firmware/apps/trace/main.c +++ b/firmware/apps/trace/main.c @@ -24,10 +24,9 @@ #include "board.h" #include "simtrace.h" #include "utils.h" +#include "main_common.h" #include "osmocom/core/timer.h" -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -158,20 +157,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\n\r\n\r" - "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" - "=============================================================================\n\r"); - - TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); - TRACE_INFO("USB configuration used: %d\n\r", simtrace_config); - + print_banner(); board_main_top(); TRACE_INFO("USB init...\n\r"); diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c index b81abdd..d22687e 100644 --- a/firmware/apps/triple_play/main.c +++ b/firmware/apps/triple_play/main.c @@ -26,8 +26,6 @@ #include "req_ctx.h" #include -unsigned int g_unique_id[4]; - /*------------------------------------------------------------------------------ * Internal variables *------------------------------------------------------------------------------*/ @@ -149,17 +147,7 @@ PIO_InitializeInterrupts(0); - EEFC_ReadUniqueID(g_unique_id); - - printf("\r\n\r\n" - "=============================================================================\r\n" - "SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n" - "=============================================================================\r\n"); - - TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n", - g_unique_id[0], g_unique_id[1], - g_unique_id[2], g_unique_id[3]); - + print_banner(); board_main_top(); TRACE_INFO("USB init...\r\n"); diff --git a/firmware/libcommon/include/main_common.h b/firmware/libcommon/include/main_common.h new file mode 100644 index 0000000..ce19f81 --- /dev/null +++ b/firmware/libcommon/include/main_common.h @@ -0,0 +1,3 @@ +#pragma once + +void print_banner(void); diff --git a/firmware/libcommon/source/main_common.c b/firmware/libcommon/source/main_common.c new file mode 100644 index 0000000..3314595 --- /dev/null +++ b/firmware/libcommon/source/main_common.c @@ -0,0 +1,54 @@ +/* SIMtrace 2 firmware common main helpers + * + * (C) 2015-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "board.h" +#include "utils.h" + +void print_banner(void) +{ + printf("\n\r\n\r" + "=============================================================================\n\r" + "SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\n\r" + "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" + "=============================================================================\n\r"); + +#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) + /* print chip-unique ID */ + unsigned int unique_id[4]; + EEFC_ReadUniqueID(unique_id); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", + unique_id[0], unique_id[1], unique_id[2], unique_id[3]); + + /* print reset cause */ + uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos; + static const char* reset_causes[] = { + "general reset (first power-up reset)", + "backup reset (return from backup mode)", + "watchdog reset (watchdog fault occurred)", + "software reset (processor reset required by the software)", + "user reset (NRST pin detected low)", + }; + if (reset_cause < ARRAY_SIZE(reset_causes)) { + TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); + } else { + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + } +#endif +} -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a Gerrit-Change-Number: 16802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:03:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:03:56 +0000 Subject: Change in simtrace2[master]: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16803 ) Change subject: firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c ...................................................................... firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c In the end we want to share most of this, irrespective of the "APP". Let's avoid unnecessary differences. Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a --- M firmware/apps/cardem/main.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index f6a5ab5..3476af2 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -39,7 +39,7 @@ void (*exit) (void); /* main loop content for given configuration */ void (*run) (void); - /* Interrupt handler for USART1 */ + /* Interrupt handler for USART0 */ void (*usart0_irq) (void); /* Interrupt handler for USART1 */ void (*usart1_irq) (void); @@ -53,6 +53,8 @@ .init = Sniffer_init, .exit = Sniffer_exit, .run = Sniffer_run, + .usart0_irq = Sniffer_usart0_irq, + .usart1_irq = Sniffer_usart1_irq, }, #endif #ifdef HAVE_CCID @@ -174,8 +176,7 @@ } TRACE_INFO("calling configure of all configurations...\n\r"); - for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); - ++i) { + for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) { if (config_func_ptrs[i].configure) config_func_ptrs[i].configure(); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a Gerrit-Change-Number: 16803 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:08:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:08:05 +0000 Subject: Change in osmo-bts[master]: common/abis.c: make use of RSL TEI from OML IPA RSL Connect In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16340 ) Change subject: common/abis.c: make use of RSL TEI from OML IPA RSL Connect ...................................................................... Patch Set 3: > Patch Set 1: > > I am not really sure about this change. I have been playing around with a multi-TRX setup, and noticed that using a different (than 0x00) 'rsl e1 tei' value in osmo-bsc.cfg makes osmo-bts-trx fail to start. I figured out that this value is being sent in the (BSC originated) OML IPA RSL Connect message as 'Stream ID', but osmo-bts does not use it at all. This value also appears in the IPA header as the protocol type. In general, as far as I remember, the different RSL E1 TEI values are primarily used on actual E1 links. So if you have an E1 BTS with multiple TRX, then you may only have a single signaling timeslot for one global/shared OML LAPD connection, and for each TRX you have a separate LAPD connection, differentiated by the TEI. TEI=0 is TRX0, TEI=1 is TRX1, etc. For IPA based Abis, I don't think it really matters all that much, as there are separate TCP connections for each RSL connection, so you don't have a strict requirement to differentiate multiple logical RSL streams in one underlying shared channel. But still it's of course good to support such operation on the BTS side if the BSC does... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5927f59a49724170a63e87be604973f7c9d5d8be Gerrit-Change-Number: 16340 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 13:08:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:08:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:08:37 +0000 Subject: Change in osmo-bts[master]: common/vty.c: get rid of generic exit / end commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16338 ) Change subject: common/vty.c: get rid of generic exit / end commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb Gerrit-Change-Number: 16338 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 13:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:08:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:08:46 +0000 Subject: Change in osmo-bts[master]: common/vty.c: get rid of generic exit / end commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16338 ) Change subject: common/vty.c: get rid of generic exit / end commands ...................................................................... common/vty.c: get rid of generic exit / end commands Those commands are now handled by libosmovty itself. Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb --- M src/common/vty.c 1 file changed, 0 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index b32b39b..1be0ac0 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -125,48 +125,6 @@ } } -gDEFUN(ournode_exit, ournode_exit_cmd, "exit", - "Exit current node, go down to provious node") -{ - switch (vty->node) { - case PHY_INST_NODE: - vty->node = PHY_NODE; - { - struct phy_instance *pinst = vty->index; - vty->index = pinst->phy_link; - } - break; - case PHY_NODE: - vty->node = CONFIG_NODE; - vty->index = NULL; - break; - case TRX_NODE: - vty->node = BTS_NODE; - { - struct gsm_bts_trx *trx = vty->index; - vty->index = trx->bts; - } - break; - default: - break; - } - return CMD_SUCCESS; -} - -gDEFUN(ournode_end, ournode_end_cmd, "end", - "End current mode and change to enable mode") -{ - switch (vty->node) { - default: - vty_config_unlock(vty); - vty->node = ENABLE_NODE; - vty->index = NULL; - vty->index_sub = NULL; - break; - } - return CMD_SUCCESS; -} - static const char osmobts_copyright[] = "Copyright (C) 2010, 2011 by Harald Welte, Andreas Eversberg and On-Waves\r\n" "License AGPLv3+: GNU AGPL version 3 or later \r\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I425f9058ae15de929e2ba0283d4057bdf767aeeb Gerrit-Change-Number: 16338 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:08:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:08:47 +0000 Subject: Change in osmo-bts[master]: common/abis.c: make use of RSL TEI from OML IPA RSL Connect In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16340 ) Change subject: common/abis.c: make use of RSL TEI from OML IPA RSL Connect ...................................................................... common/abis.c: make use of RSL TEI from OML IPA RSL Connect Change-Id: I5927f59a49724170a63e87be604973f7c9d5d8be --- M src/common/abis.c M src/common/oml.c 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/common/abis.c b/src/common/abis.c index 2da1ddd..44b8eff 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -128,7 +128,8 @@ e1inp_ts_config_sign(&line->ts[type-1], line); sign_link = trx->rsl_link = e1inp_sign_link_create(&line->ts[type-1], - E1INP_SIGN_RSL, trx, 0, 0); + E1INP_SIGN_RSL, trx, + trx->rsl_tei, 0); trx_link_estab(trx); break; } diff --git a/src/common/oml.c b/src/common/oml.c index 3defa49..7a62faa 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1323,8 +1323,10 @@ if (trx->bts->variant == BTS_OSMO_OMLDUMMY) { rc = 0; LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name); - } else + } else { + trx->rsl_tei = stream_id; rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); + } if (rc < 0) { LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc); return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5927f59a49724170a63e87be604973f7c9d5d8be Gerrit-Change-Number: 16340 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:10:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:10:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 ) Change subject: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 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: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c Gerrit-Change-Number: 16798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 13:10:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:11:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:11:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 ) Change subject: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 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: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 Gerrit-Change-Number: 16799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 13:11:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:11:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:11:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 ) Change subject: bsc: Introduce test TC_chan_rel_sccp_tiar_timeout ...................................................................... bsc: Introduce test TC_chan_rel_sccp_tiar_timeout Verify SCCP T(iar) timeout triggers release of established channel. Change-Id: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M library/Osmocom_VTY_Functions.ttcn 3 files changed, 41 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9c8d68d..d020d95 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -97,6 +97,11 @@ /* Osmux is enabled through VTY */ var boolean g_osmux_enabled := false; + /*Configure T(tias) over VTY, seconds */ + var integer g_bsc_sccp_timer_ias := 7 * 60; + /*Configure T(tiar) over VTY, seconds */ + var integer g_bsc_sccp_timer_iar := 15 * 60; + /* global test case guard timer */ timer T_guard := 30.0; @@ -332,6 +337,8 @@ map(self:BSCVTY, system:BSCVTY); f_vty_set_prompts(BSCVTY); f_vty_transceive(BSCVTY, "enable"); + f_cs7_inst_0_cfg(BSCVTY, {"sccp-timer ias " & int2str(g_bsc_sccp_timer_ias), + "sccp-timer iar " & int2str(g_bsc_sccp_timer_iar)}); } /* global initialization function @@ -1064,6 +1071,23 @@ setverdict(pass); } +/* Verify T(iar) triggers and releases the channel */ +testcase TC_chan_rel_sccp_tiar_timeout() runs on test_CT { + var DchanTuple dt; + + /* Set T(iar) in BSC low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_bsc_sccp_timer_ias := 2; + g_bsc_sccp_timer_iar := 5; + + f_init(1); + + dt := f_est_dchan('23'O, 23, '00010203040506'O); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); + setverdict(pass); +} + /* Test behavior if RSL EST IND for non-active channel */ testcase TC_rll_est_ind_inact_lchan() runs on test_CT { timer T := 2.0; @@ -3632,6 +3656,15 @@ f_vty_transceive(BSCVTY, "end"); } +private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) +{ + f_vty_enter_cfg_cs7_inst(pt, 0); + for (var integer i := 0; i < sizeof(cmds); i := i+1) { + f_vty_transceive(pt, cmds[i]); + } + f_vty_transceive(pt, "end"); +} + private function f_probe_for_handover(charstring log_label, charstring log_descr, charstring handover_vty_cmd, @@ -4419,6 +4452,7 @@ execute( TC_chan_rel_hard_rlsd() ); execute( TC_chan_rel_hard_rlsd_ms_dead() ); execute( TC_chan_rel_a_reset() ); + execute( TC_chan_rel_sccp_tiar_timeout() ); execute( TC_outbound_connect() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index eb932ef..e266660 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -19,6 +19,7 @@ + diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index a1724e9..823d79f 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -102,6 +102,7 @@ type integer BtsTrxNr (0..255); type integer BtsTimeslotNr (0..7); type integer MscNr (0..255); + type integer Cs7Nr (0..255); type charstring BtsGprsMode ("none", "gprs", "egrps"); @@ -135,6 +136,11 @@ f_vty_transceive(pt, "msc " & int2str(msc)); } + function f_vty_enter_cfg_cs7_inst(TELNETasp_PT pt, Cs7Nr cs7_inst := 0) { + f_vty_enter_config(pt); + f_vty_transceive(pt, "cs7 instance " & int2str(cs7_inst)); + } + type record of charstring rof_charstring; function f_vty_config2(TELNETasp_PT pt, rof_charstring config_nodes, charstring cmd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16798 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: Ic2724f62689b99c33e2e5c3a0c2fd022178a788c Gerrit-Change-Number: 16798 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:11:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:11:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 ) Change subject: msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout ...................................................................... msc: Introduce test TC_(iu_)chan_rel_sccp_tiar_timeout Verify SCCP T(iar) timeout triggers release of established channel. Related: OS#4343 Change-Id: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 64 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 177c2f8..bf7f748 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -113,6 +113,11 @@ * handler is not active, which means that also no guard timer is * set up. The following timer will serve as a replacement */ timer Tguard_direct := 60.0; + + /* Configure T(tias) over VTY, seconds */ + var integer g_msc_sccp_timer_ias := 7 * 60; + /* Configure T(tiar) over VTY, seconds */ + var integer g_msc_sccp_timer_iar := 15 * 60; } modulepar { @@ -337,6 +342,8 @@ f_vty_config(MSCVTY, "msc", "assign-tmsi"); f_vty_config(MSCVTY, "msc", "check-imei-rqd 0"); f_vty_config(MSCVTY, "network", "encryption a5 0"); + f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer ias " & int2str(g_msc_sccp_timer_ias)); + f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer iar " & int2str(g_msc_sccp_timer_iar)); if (mp_enable_osmux_test) { if (osmux) { f_vty_config(MSCVTY, "msc", "osmux on"); @@ -676,6 +683,45 @@ vc_conn.done; } +/* Verify T(iar) triggers and releases the channel */ +friend function f_lu_and_mo_call_sccp_tiar_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + timer T_wait_iar := int2float(5 + 1); /* g_msc_sccp_timer_iar + Give extra time (+1 sec) */ + f_init_handler(pars); + var CallParameters cpars := valueof(t_CallParams); + f_perform_lu(); + f_mo_call_establish(cpars); + + /* Expect the channel cleared upon T(iar) triggered: */ + T_wait_iar.start; + alt { + [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + T_wait_iar.stop + setverdict(pass); + } + [] MGCP.receive(tr_DLCX(?)) { repeat; } + [] T_wait_iar.timeout { + setverdict(fail, "Timeout waiting for T(iar) triggered SCCP RSLD"); + mtc.stop; + } + } + + setverdict(pass); +} +testcase TC_lu_and_mo_call_sccp_tiar_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + /* Set T(iar) in MSC low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_msc_sccp_timer_ias := 2; + g_msc_sccp_timer_iar := 5; + + f_init(); + + vc_conn := f_start_handler(refers(f_lu_and_mo_call_sccp_tiar_timeout), 89); + vc_conn.done; +} + /* Test LU (with authentication enabled), where HLR times out sending SAI response */ friend function f_tc_lu_auth_sai_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -5816,6 +5862,7 @@ execute( TC_lu_imsi_timeout_tmsi_realloc() ); execute( TC_cmserv_imsi_unknown() ); execute( TC_lu_and_mo_call() ); + execute( TC_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); execute( TC_lu_clear_request() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index b6b0983..e894598 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -80,6 +80,21 @@ vc_conn.done; } +testcase TC_iu_lu_and_mo_call_sccp_tiar_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + /* Set T(iar) in MSC low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_msc_sccp_timer_ias := 2; + g_msc_sccp_timer_iar := 5; + + f_init(3); + + vc_conn := f_start_handler(refers(f_lu_and_mo_call_sccp_tiar_timeout), 1019, ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_lu_auth_sai_timeout() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -515,6 +530,7 @@ execute( TC_iu_lu_imsi_timeout_tmsi_realloc() ); execute( TC_iu_cmserv_imsi_unknown() ); execute( TC_iu_lu_and_mo_call() ); + execute( TC_iu_lu_and_mo_call_sccp_tiar_timeout() ); execute( TC_iu_lu_auth_sai_timeout() ); execute( TC_iu_lu_auth_sai_err() ); execute( TC_iu_lu_release_request() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 074eeb1..e2cca45 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -14,6 +14,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16799 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: Id6488a262e656f5c8fabb4e81f4797b305eb09e2 Gerrit-Change-Number: 16799 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:12:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:12:22 +0000 Subject: Change in libosmo-netif[master]: stream.c: Improve logging during sock send() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16779 ) Change subject: stream.c: Improve logging during sock send() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff275c809ec2bb34f471d15bfdc92296566b76a7 Gerrit-Change-Number: 16779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 13:12:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:12:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:12:33 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Introduce --{enable, disable}-libsctp configure flag In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure.ac: Introduce --{enable,disable}-libsctp configure flag ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 13:12:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:12:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:12:42 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Introduce --{enable, disable}-libsctp configure flag In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure.ac: Introduce --{enable,disable}-libsctp configure flag ...................................................................... configure.ac: Introduce --{enable,disable}-libsctp configure flag Similar to what we do in libosmocore already, we want to deterministically enable or disable support for the feature without having into account if the system has a libsctp. If libsctp is missing and support is enabled, then fail. Extra checks are also added: * Check netinet/sctp.h header * Check libosmocore was built with libsctp support (API osmo_sock_init2_multiaddr() we require). * In stream.c make sure it can be built without HAVE_LIBSCTP, and that set_addrs() fails for more than 1 address (since that feature is only supported through osmo_sock_init2_multiaddrs()). Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d --- M configure.ac M src/stream.c 2 files changed, 38 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 7af10ec..a96fb70 100644 --- a/configure.ac +++ b/configure.ac @@ -87,16 +87,24 @@ dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -old_LIBS=$LIBS -AC_SEARCH_LIBS([sctp_send], [sctp], [ - AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) - AC_SUBST(HAVE_LIBSCTP, [1]) - if test -n "$ac_lib"; then - AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) - fi - ], [ - AC_MSG_ERROR([sctp_send not found in searched libs])]) -LIBS=$old_LIBS +AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], + [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) +AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") +AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"], [ + AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found)) + old_LIBS=$LIBS + AC_CHECK_LIB(osmocore, osmo_sock_init2_multiaddr,, AC_MSG_ERROR(libosmocore built without libsctp support), $LIBOSMOCORE_LIBS) + LIBS=$old_LIBS + AC_SEARCH_LIBS([sctp_send], [sctp], [ + AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) + AC_SUBST(HAVE_LIBSCTP, [1]) + if test -n "$ac_lib"; then + AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) + fi + ], [ + AC_MSG_ERROR([sctp_send not found in searched libs])]) + LIBS=$old_LIBS +]) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/src/stream.c b/src/stream.c index 744a904..537fd28 100644 --- a/src/stream.c +++ b/src/stream.c @@ -106,9 +106,11 @@ int rc; switch (proto) { +#ifdef HAVE_LIBSCTP case IPPROTO_SCTP: rc = setsockopt(fd, IPPROTO_SCTP, SCTP_NODELAY, &on, sizeof(on)); break; +#endif case IPPROTO_TCP: rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); break; @@ -143,15 +145,21 @@ #define OSMO_STREAM_CLI_F_RECONF (1 << 0) #define OSMO_STREAM_CLI_F_NODELAY (1 << 1) +#ifdef HAVE_LIBSCTP +#define OSMO_STREAM_MAX_ADDRS OSMO_SOCK_MAX_ADDRS +#else +#define OSMO_STREAM_MAX_ADDRS 1 +#endif + struct osmo_stream_cli { struct osmo_fd ofd; struct llist_head tx_queue; struct osmo_timer_list timer; enum osmo_stream_cli_state state; - char *addr[OSMO_SOCK_MAX_ADDRS]; + char *addr[OSMO_STREAM_MAX_ADDRS]; uint8_t addrcnt; uint16_t port; - char *local_addr[OSMO_SOCK_MAX_ADDRS]; + char *local_addr[OSMO_STREAM_MAX_ADDRS]; uint8_t local_addrcnt; uint16_t local_port; uint16_t proto; @@ -369,7 +377,7 @@ { int i = 0; - if (addrcnt > OSMO_SOCK_MAX_ADDRS) + if (addrcnt > OSMO_STREAM_MAX_ADDRS) return -EINVAL; for (; i < addrcnt; i++) @@ -426,7 +434,7 @@ { int i = 0; - if (addrcnt > OSMO_SOCK_MAX_ADDRS) + if (addrcnt > OSMO_STREAM_MAX_ADDRS) return -EINVAL; for (; i < addrcnt; i++) @@ -554,12 +562,14 @@ cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; switch (cli->proto) { +#ifdef HAVE_LIBSCTP case IPPROTO_SCTP: ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto, (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port, (const char **)cli->addr, cli->addrcnt, cli->port, OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); break; +#endif default: ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto, cli->local_addr[0], cli->local_port, @@ -623,12 +633,14 @@ switch (cli->proto) { +#ifdef HAVE_LIBSCTP case IPPROTO_SCTP: ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto, (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port, (const char **)cli->addr, cli->addrcnt, cli->port, OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); break; +#endif default: ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto, cli->local_addr[0], cli->local_port, @@ -718,7 +730,7 @@ struct osmo_stream_srv_link { struct osmo_fd ofd; - char *addr[OSMO_SOCK_MAX_ADDRS]; + char *addr[OSMO_STREAM_MAX_ADDRS]; uint8_t addrcnt; uint16_t port; uint16_t proto; @@ -830,7 +842,7 @@ { int i = 0; - if (addrcnt > OSMO_SOCK_MAX_ADDRS) + if (addrcnt > OSMO_STREAM_MAX_ADDRS) return -EINVAL; for (; i < addrcnt; i++) @@ -950,11 +962,13 @@ link->flags &= ~OSMO_STREAM_SRV_F_RECONF; switch (link->proto) { +#ifdef HAVE_LIBSCTP case IPPROTO_SCTP: ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, link->proto, (const char **)link->addr, link->addrcnt, link->port, NULL, 0, 0, OSMO_SOCK_F_BIND); break; +#endif default: ret = osmo_sock_init(AF_INET, SOCK_STREAM, link->proto, link->addr[0], link->port, OSMO_SOCK_F_BIND); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:12:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:12:43 +0000 Subject: Change in libosmo-netif[master]: configure.ac: Drop unneeded check for dahdi In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16774 ) Change subject: configure.ac: Drop unneeded check for dahdi ...................................................................... configure.ac: Drop unneeded check for dahdi This check was added during libosmo-netif's initial commit, and there's nothing requiring DAHDI in here. It's most possible a copy-paste artifact when creating configure.ac. Change-Id: Ief25a12696d797eaf50b0373e8310add93b9dc9e --- M configure.ac 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index a96fb70..8452d17 100644 --- a/configure.ac +++ b/configure.ac @@ -106,8 +106,6 @@ LIBS=$old_LIBS ]) -AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) - found_pcap=yes AC_CHECK_HEADERS(pcap.h,,found_pcap=no) AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ief25a12696d797eaf50b0373e8310add93b9dc9e Gerrit-Change-Number: 16774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:12:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:12:43 +0000 Subject: Change in libosmo-netif[master]: stream.c: Improve logging during sock send() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16779 ) Change subject: stream.c: Improve logging during sock send() ...................................................................... stream.c: Improve logging during sock send() Change-Id: Iff275c809ec2bb34f471d15bfdc92296566b76a7 --- M src/stream.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 537fd28..fe3de2a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -239,8 +239,6 @@ struct llist_head *lh; int ret; - LOGSCLI(cli, LOGL_DEBUG, "sending data\n"); - if (llist_empty(&cli->tx_queue)) { cli->ofd.when &= ~BSC_FD_WRITE; return 0; @@ -254,6 +252,8 @@ return 0; } + LOGSCLI(cli, LOGL_DEBUG, "sending %u bytes of data\n", msgb_length(msg)); + switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: @@ -266,14 +266,14 @@ #endif case IPPROTO_TCP: default: - ret = send(cli->ofd.fd, msg->data, msg->len, 0); + ret = send(cli->ofd.fd, msg->data, msgb_length(msg), 0); break; } if (ret < 0) { if (errno == EPIPE || errno == ENOTCONN) { osmo_stream_cli_reconnect(cli); } - LOGSCLI(cli, LOGL_ERROR, "error to send\n"); + LOGSCLI(cli, LOGL_ERROR, "error %d to send\n", ret); } msgb_free(msg); return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff275c809ec2bb34f471d15bfdc92296566b76a7 Gerrit-Change-Number: 16779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:14:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:14:43 +0000 Subject: Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 13:14:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:14:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:14:48 +0000 Subject: Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 --- M include/osmocom/netif/amr.h M include/osmocom/netif/osmux.h M include/osmocom/netif/rtp.h 3 files changed, 16 insertions(+), 27 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 729d0ae..6e37c99 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -43,16 +43,7 @@ */ struct amr_hdr { -#if OSMO_IS_BIG_ENDIAN - /* Payload Header */ - uint8_t cmr:4, /* Codec Mode Request */ - pad1:4; - /* Table of Contents */ - uint8_t f:1, /* followed by another speech frame? */ - ft:4, /* coding mode */ - q:1, /* OK (not damaged) at origin? */ - pad2:2; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, cmr:4; /* Codec Mode Request */ @@ -61,6 +52,10 @@ q:1, /* OK (not damaged) at origin? */ ft:4, /* coding mode */ f:1; /* followed by another speech frame? */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cmr:4, pad1:4; + uint8_t f:1, ft:4, q:1, pad2:2; #endif } __attribute__((packed)); diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 7dee438..6305dc8 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -30,28 +30,25 @@ #define OSMUX_FT_DUMMY 2 struct osmux_hdr { -#if OSMO_IS_BIG_ENDIAN - uint8_t rtp_m:1, - ft:2, - ctr:3, - amr_f:1, - amr_q:1; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN uint8_t amr_q:1, amr_f:1, ctr:3, ft:2, rtp_m:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t rtp_m:1, ft:2, ctr:3, amr_f:1, amr_q:1; #endif uint8_t seq; #define OSMUX_CID_MAX 255 /* determined by circuit_id */ uint8_t circuit_id; -#if OSMO_IS_BIG_ENDIAN - uint8_t amr_ft:4, - amr_cmr:4; -#elif OSMO_IS_LITTLE_ENDIAN +#if OSMO_IS_LITTLE_ENDIAN uint8_t amr_cmr:4, amr_ft:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t amr_ft:4, amr_cmr:4; #endif } __attribute__((packed)); diff --git a/include/osmocom/netif/rtp.h b/include/osmocom/netif/rtp.h index c01df41..4e40745 100644 --- a/include/osmocom/netif/rtp.h +++ b/include/osmocom/netif/rtp.h @@ -13,12 +13,9 @@ uint8_t payload_type:7, marker:1; #elif OSMO_IS_BIG_ENDIAN - uint8_t version:2, - padding:1, - extension:1, - csrc_count:4; - uint8_t marker:1, - payload_type:7; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t version:2, padding:1, extension:1, csrc_count:4; + uint8_t marker:1, payload_type:7; #endif uint16_t sequence; uint32_t timestamp; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:15:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:15:08 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: origin/master only In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16768 ) Change subject: jobs/update-osmo-ci-on-slaves: origin/master only ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 Gerrit-Change-Number: 16768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 13:15:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:15:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:15:10 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves: origin/master only In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16768 ) Change subject: jobs/update-osmo-ci-on-slaves: origin/master only ...................................................................... jobs/update-osmo-ci-on-slaves: origin/master only Don't run, when different branches were pushed. Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Verified diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index d1bc893..2c7309e 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -22,6 +22,8 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' skip-tag: true + branches: + - 'origin/master' triggers: - pollscm: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2cf55391066b60cf6a594f528ed0eaf59a886391 Gerrit-Change-Number: 16768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:15:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:15:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: skip tests that need PCU socket access In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 ) Change subject: BTS_Tests: skip tests that need PCU socket access ...................................................................... BTS_Tests: skip tests that need PCU socket access Some tests need direct access to the pcu socket, however, when working with hardware bts this socket is not always available. The tests that depend on the pcu socket are then skipped by the testsuite. The following tests are not automatically excluded, but require direct PCU access. Lets exclude them as well: - TC_dyn_osmo_pdch_act_deact - TC_dyn_osmo_pdch_double_act - TC_dyn_ipa_pdch_act_deact - TC_dyn_ipa_pdch_act_tchf_act_nack Change-Id: I735b85d2ff3f541ebf0a558735d6172d69e7c29f Related: OS#3863 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 3683306..7fa1af6 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6465,19 +6465,20 @@ execute( TC_pcu_socket_connect_si3gprs() ); execute( TC_pcu_socket_disconnect_nosi3gprs() ); execute( TC_pcu_socket_verify_info_ind() ); + execute( TC_dyn_osmo_pdch_act_deact() ); + execute( TC_dyn_osmo_pdch_double_act() ); + execute( TC_dyn_ipa_pdch_act_deact() ); + execute( TC_dyn_ipa_pdch_act_tchf_act_nack() ); + } else { log("PCU socket path not available, skipping PCU tests"); } - execute( TC_dyn_osmo_pdch_act_deact() ); execute( TC_dyn_osmo_pdch_unsol_deact() ); - execute( TC_dyn_osmo_pdch_double_act() ); execute( TC_dyn_osmo_pdch_tchf_act() ); execute( TC_dyn_osmo_pdch_tchh_act() ); - execute( TC_dyn_ipa_pdch_act_deact() ); execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); - execute( TC_dyn_ipa_pdch_act_tchf_act_nack() ); execute( TC_rll_est_ind() ); execute( TC_rll_est_req_DCCH_3() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13748 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: I735b85d2ff3f541ebf0a558735d6172d69e7c29f Gerrit-Change-Number: 13748 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:18:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:18:09 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 3: Code-Review-1 > As a reference, I think it makes more sense to change it for all log targets this way: ACK. Let's do it that way, if somebody wants to spend their time on changing -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 12 Jan 2020 13:18:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:18:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:18:52 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Skip storing data to disk if line is in ALARM state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185 ) Change subject: e1_recorder: Skip storing data to disk if line is in ALARM state ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ie4c671053d372bc700f506198d1916853da03b9e Gerrit-Change-Number: 16185 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:19:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:19:07 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Skip storing data to disk if line is in ALARM state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185 ) Change subject: e1_recorder: Skip storing data to disk if line is in ALARM state ...................................................................... e1_recorder: Skip storing data to disk if line is in ALARM state Change-Id: Ie4c671053d372bc700f506198d1916853da03b9e --- M src/e1_recorder.c M src/recorder.h 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 82558b2..333375d 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -31,6 +31,29 @@ } } +static int sig_inp_cbfn(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) +{ + struct input_signal_data *isd = signal_data; + struct e1_recorder_line *rline; + + OSMO_ASSERT(subsys == SS_L_INPUT); + OSMO_ASSERT(isd->line && isd->line->num < ARRAY_SIZE(g_recorder.line)); + + switch (signal) { + case S_L_INP_LINE_ALARM: + LOGP(DMAIN, LOGL_NOTICE, "Line %u: ALARM\n", isd->line->num); + rline = &g_recorder.line[isd->line->num]; + rline->has_alarm = true; + break; + case S_L_INP_LINE_NOALARM: + LOGP(DMAIN, LOGL_NOTICE, "Line %u: NOALARM\n", isd->line->num); + rline = &g_recorder.line[isd->line->num]; + rline->has_alarm = false; + break; + } + return 0; +} + /* receive a raw message frome the E1 timeslot */ void e1ts_raw_recv(struct e1inp_ts *ts, struct msgb *msg) { @@ -38,6 +61,11 @@ enum osmo_e1cap_capture_mode cap_mode = ts2cap_mode(ts); int rc; + if (rline->has_alarm) { + DEBUGP(DMAIN, "Skipping storage as line %u is in ALARM\n", ts->line->num); + return; + } + /* FIXME: special processing of TFP and PGSL */ rc = e1frame_store(ts, msg, cap_mode); @@ -170,6 +198,8 @@ handle_options(argc, argv); + osmo_signal_register_handler(SS_L_INPUT, sig_inp_cbfn, NULL); + rc = vty_read_config_file(g_config_file, NULL); if (rc < 0) { fprintf(stderr, "Cannot parse configuration file '%s': %s\n", g_config_file, diff --git a/src/recorder.h b/src/recorder.h index 12bc993..458fb1d 100644 --- a/src/recorder.h +++ b/src/recorder.h @@ -17,6 +17,7 @@ }; struct e1_recorder_line { + bool has_alarm; struct { bool enabled; uint8_t line_nr; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ie4c671053d372bc700f506198d1916853da03b9e Gerrit-Change-Number: 16185 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Initial osmo-e1d support In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 to look at the new patch set (#3). Change subject: e1d: Initial osmo-e1d support ...................................................................... e1d: Initial osmo-e1d support osmo-e1d is part of the Osmocom 'software defined E1 interface, which consists of a USB device for the actual E1 hardware interfacing, and a daemon (osmo-e1d) implementing a libusb-based driver. This commit adds initial support for talking to osmo-e1d using the related libosmoe1d library. You need to use '--enable-e1d' at configure time to enable it. Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Signed-off-by: Sylvain Munaut --- M configure.ac M include/osmocom/abis/e1_input.h M src/Makefile.am M src/e1_input.c M src/e1_input_vty.c A src/input/e1d.c 6 files changed, 312 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/67/14867/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Gerrit-Change-Number: 14867 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Use HAVE_E1D in C source, not ENABLE_E1D In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 to look at the new patch set (#3). Change subject: e1d: Use HAVE_E1D in C source, not ENABLE_E1D ...................................................................... e1d: Use HAVE_E1D in C source, not ENABLE_E1D The config.h files contains HAVE_E1D. Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 --- M src/e1_input.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/68/14868/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 Gerrit-Change-Number: 14868 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: add missing forward-declaration of e1inp_e1d_init() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 to look at the new patch set (#3). Change subject: e1d: add missing forward-declaration of e1inp_e1d_init() ...................................................................... e1d: add missing forward-declaration of e1inp_e1d_init() Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd --- M src/e1_input.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/69/14869/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd Gerrit-Change-Number: 14869 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 to look at the new patch set (#2). Change subject: e1d: Don't use perror() directly, use osmocom logging instead ...................................................................... e1d: Don't use perror() directly, use osmocom logging instead Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 --- M src/input/e1d.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/19/16819/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 Gerrit-Change-Number: 16819 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove EXCEPTFD handling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 to look at the new patch set (#2). Change subject: e1d: Remove EXCEPTFD handling ...................................................................... e1d: Remove EXCEPTFD handling The file decscriptor 'except' handling was only added in the DAHDI input module as the DAHDI kernel side is actually using those. I don't think we can even use this in any way over unix domain sockets. Change-Id: I718629179181a1de3b82e23447549f593046d91f --- M src/input/e1d.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/20/16820/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I718629179181a1de3b82e23447549f593046d91f Gerrit-Change-Number: 16820 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove bogus vty_show function. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 to look at the new patch set (#2). Change subject: e1d: Remove bogus vty_show function. ...................................................................... e1d: Remove bogus vty_show function. It's optional for an input driver to provide this function, and e.g. mISDN doesn't provide it, either. Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 --- M src/input/e1d.c 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/21/16821/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 Gerrit-Change-Number: 16821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Use line->port_nr to specify e1d interface/line In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 to look at the new patch set (#2). Change subject: e1d: Use line->port_nr to specify e1d interface/line ...................................................................... e1d: Use line->port_nr to specify e1d interface/line This way we can support more than one E1 line via osmo-e1d. As neither mISDN nor DAHDI distinguish between mutliple cards of single ports vs. multi-port cards, we havee to map both interface + line number into a single uint8_t. Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 --- M src/input/e1d.c 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/22/16822/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 Gerrit-Change-Number: 16822 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Use LOGPIL/LOGPITS logging macros to give context In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 to look at the new patch set (#2). Change subject: e1d: Use LOGPIL/LOGPITS logging macros to give context ...................................................................... e1d: Use LOGPIL/LOGPITS logging macros to give context Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 --- M src/input/e1d.c 1 file changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/16823/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 Gerrit-Change-Number: 16823 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 to look at the new patch set (#2). Change subject: e1d: Don't connect to e1d at program start time ...................................................................... e1d: Don't connect to e1d at program start time Let's not print an error at program/library start time if osmo-e1d cannot be reached. This error is confusing to everyone who may have a libosmo-abis with e1d support compiled in, but who is not (currently) using any lines via this driver, but others drivers. Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 --- M src/input/e1d.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/24/16824/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 Gerrit-Change-Number: 16824 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 13:30:15 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 to look at the new patch set (#2). Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... e1d: Implement varions non-LAPD timeslot modes So far, the e1d input driver only contained code for LAPD signaling slots, let's extend it with support for all the other slot types, as well as support for run-time re-configuration. Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a --- M src/input/e1d.c 1 file changed, 56 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/16825/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:56:28 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:56:28 +0000 Subject: Change in libosmo-abis[master]: e1d: Initial osmo-e1d support In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14867 ) Change subject: e1d: Initial osmo-e1d support ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Gerrit-Change-Number: 14867 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:56:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:56:43 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:56:43 +0000 Subject: Change in libosmo-abis[master]: e1d: Use HAVE_E1D in C source, not ENABLE_E1D In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14868 ) Change subject: e1d: Use HAVE_E1D in C source, not ENABLE_E1D ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 Gerrit-Change-Number: 14868 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:56:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:56:59 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:56:59 +0000 Subject: Change in libosmo-abis[master]: e1d: add missing forward-declaration of e1inp_e1d_init() In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14869 ) Change subject: e1d: add missing forward-declaration of e1inp_e1d_init() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd Gerrit-Change-Number: 14869 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:13 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:13 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16819 ) Change subject: e1d: Don't use perror() directly, use osmocom logging instead ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 Gerrit-Change-Number: 16819 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:22 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:22 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove EXCEPTFD handling In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16820 ) Change subject: e1d: Remove EXCEPTFD handling ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I718629179181a1de3b82e23447549f593046d91f Gerrit-Change-Number: 16820 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:29 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:29 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove bogus vty_show function. In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16821 ) Change subject: e1d: Remove bogus vty_show function. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 Gerrit-Change-Number: 16821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:36 +0000 Subject: Change in libosmo-abis[master]: e1d: Use line->port_nr to specify e1d interface/line In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16822 ) Change subject: e1d: Use line->port_nr to specify e1d interface/line ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 Gerrit-Change-Number: 16822 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:43 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:43 +0000 Subject: Change in libosmo-abis[master]: e1d: Use LOGPIL/LOGPITS logging macros to give context In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16823 ) Change subject: e1d: Use LOGPIL/LOGPITS logging macros to give context ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 Gerrit-Change-Number: 16823 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:57:49 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:57:49 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16824 ) Change subject: e1d: Don't connect to e1d at program start time ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 Gerrit-Change-Number: 16824 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:57:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 13:58:59 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 13:58:59 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16825 ) Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/16825/2/src/input/e1d.c File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/16825/2/src/input/e1d.c at 203 PS2, Line 203: ret = osmo_e1dp_client_ts_query(g_e1d, &ts_info, &num_ts_info, e1d_intf, e1d_line, 0); * ts argument needs to be E1DP_INVALID to get the infos from all timeslots * ts_info needs to be freed -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 13:58:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:10:14 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 to look at the new patch set (#3). Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... e1d: Implement varions non-LAPD timeslot modes So far, the e1d input driver only contained code for LAPD signaling slots, let's extend it with support for all the other slot types, as well as support for run-time re-configuration. Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a --- M src/input/e1d.c 1 file changed, 61 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/16825/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:34:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:34:08 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 to look at the new patch set (#4). Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... e1d: Implement varions non-LAPD timeslot modes So far, the e1d input driver only contained code for LAPD signaling slots, let's extend it with support for all the other slot types, as well as support for run-time re-configuration. Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a --- M src/input/e1d.c 1 file changed, 61 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/16825/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:34:56 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sun, 12 Jan 2020 14:34:56 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16825 ) Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:34:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:36:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:36:35 +0000 Subject: Change in libosmo-abis[master]: e1d: Initial osmo-e1d support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14867 ) Change subject: e1d: Initial osmo-e1d support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Gerrit-Change-Number: 14867 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:36:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:36:39 +0000 Subject: Change in libosmo-abis[master]: e1d: Use HAVE_E1D in C source, not ENABLE_E1D In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14868 ) Change subject: e1d: Use HAVE_E1D in C source, not ENABLE_E1D ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 Gerrit-Change-Number: 14868 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:36:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:36:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:36:43 +0000 Subject: Change in libosmo-abis[master]: e1d: add missing forward-declaration of e1inp_e1d_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14869 ) Change subject: e1d: add missing forward-declaration of e1inp_e1d_init() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd Gerrit-Change-Number: 14869 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:36:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:36:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:36:48 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16819 ) Change subject: e1d: Don't use perror() directly, use osmocom logging instead ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 Gerrit-Change-Number: 16819 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:36:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:36:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:36:53 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove EXCEPTFD handling In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16820 ) Change subject: e1d: Remove EXCEPTFD handling ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I718629179181a1de3b82e23447549f593046d91f Gerrit-Change-Number: 16820 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:36:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:01 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove bogus vty_show function. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16821 ) Change subject: e1d: Remove bogus vty_show function. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 Gerrit-Change-Number: 16821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:37:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:10 +0000 Subject: Change in libosmo-abis[master]: e1d: Use line->port_nr to specify e1d interface/line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16822 ) Change subject: e1d: Use line->port_nr to specify e1d interface/line ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 Gerrit-Change-Number: 16822 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:37:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:16 +0000 Subject: Change in libosmo-abis[master]: e1d: Use LOGPIL/LOGPITS logging macros to give context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16823 ) Change subject: e1d: Use LOGPIL/LOGPITS logging macros to give context ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 Gerrit-Change-Number: 16823 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:37:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:24 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16824 ) Change subject: e1d: Don't connect to e1d at program start time ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 Gerrit-Change-Number: 16824 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:37:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:34 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16825 ) Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jan 2020 14:37:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:38 +0000 Subject: Change in libosmo-abis[master]: e1d: Initial osmo-e1d support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14867 ) Change subject: e1d: Initial osmo-e1d support ...................................................................... e1d: Initial osmo-e1d support osmo-e1d is part of the Osmocom 'software defined E1 interface, which consists of a USB device for the actual E1 hardware interfacing, and a daemon (osmo-e1d) implementing a libusb-based driver. This commit adds initial support for talking to osmo-e1d using the related libosmoe1d library. You need to use '--enable-e1d' at configure time to enable it. Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Signed-off-by: Sylvain Munaut --- M configure.ac M include/osmocom/abis/e1_input.h M src/Makefile.am M src/e1_input.c M src/e1_input_vty.c A src/input/e1d.c 6 files changed, 312 insertions(+), 3 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 5a83eb1..35b8328 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,27 @@ AC_MSG_WARN([DAHDI input driver will not be built]) fi +AC_ARG_ENABLE([e1d], + [AS_HELP_STRING( + [--enable-e1d], + [Enable osmo-e1d driver support] + )], + [ + ENABLE_E1D=$enableval + ], + [ + ENABLE_E1D="no" + ]) +AS_IF([test "x$ENABLE_E1D" = "xyes"], [ + PKG_CHECK_MODULES(LIBOSMOE1D, libosmo-e1d) +]) +AM_CONDITIONAL(ENABLE_E1D, test "x$ENABLE_E1D" = "xyes") +AC_SUBST(ENABLE_E1D) +if test x"$ENABLE_E1D" = x"yes" +then + AC_DEFINE([HAVE_E1D], [1], [Enable osmo-e1d driver support]) +fi + AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( [--enable-sanitize], diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index de1c504..00b4aaa 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -129,6 +129,10 @@ struct osmo_fd fd; } dahdi; struct { + /* osmo-e1d driver has one fd for each ts */ + struct osmo_fd fd; + } e1d; + struct { struct osmo_fd fd; } rs232; } driver; diff --git a/src/Makefile.am b/src/Makefile.am index 5ae94e4..3838a5a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,9 +5,9 @@ TRAU_LIBVERSION=4:0:2 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) +COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOE1D_LIBS) lib_LTLIBRARIES = libosmoabis.la libosmotrau.la @@ -19,6 +19,7 @@ ipa_proxy.c \ subchan_demux.c \ trau_frame.c \ + input/e1d.c \ input/ipa.c \ input/ipa_keepalive.c \ input/ipaccess.c \ diff --git a/src/e1_input.c b/src/e1_input.c index a707438..cb1612d 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -890,6 +890,9 @@ #ifdef HAVE_DAHDI_USER_H e1inp_dahdi_init(); #endif +#ifdef ENABLE_E1D + e1inp_e1d_init(); +#endif e1inp_ipaccess_init(); e1inp_rs232_init(); e1inp_unixsocket_init(); diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index d81c859..a1943e6 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -41,7 +41,7 @@ /* CONFIG */ -#define E1_DRIVER_NAMES "(misdn|misdn_lapd|dahdi|ipa|unixsocket)" +#define E1_DRIVER_NAMES "(misdn|misdn_lapd|dahdi|e1d|ipa|unixsocket)" #define E1_DRIVER_HELP "mISDN supported E1 Card (kernel LAPD)\n" \ "mISDN supported E1 Card (userspace LAPD)\n" \ "DAHDI supported E1/T1/J1 Card\n" \ diff --git a/src/input/e1d.c b/src/input/e1d.c new file mode 100644 index 0000000..ceeb0c2 --- /dev/null +++ b/src/input/e1d.c @@ -0,0 +1,280 @@ +/* OpenBSC Abis input driver for osmo-e1d */ + +/* (C) 2019 by Sylvain Munaut + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include "config.h" + +#ifdef HAVE_E1D + +#include +#include +#include + +#include +#include + +#include + +#include +#include +#include + +#include +#include + + +#define TS_SIGN_ALLOC_SIZE 300 + +struct osmo_e1dp_client *g_e1d; + +/* pre-declaration */ +extern struct e1inp_driver e1d_driver; +static int e1d_want_write(struct e1inp_ts *e1i_ts); + + +static int +handle_ts_sign_read(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct msgb *msg = msgb_alloc(TS_SIGN_ALLOC_SIZE, "E1D Signaling TS"); + int ret; + + if (!msg) + return -ENOMEM; + + ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16); + if (ret < 0) { + perror("read "); + return ret; + } + + msgb_put(msg, ret); + if (ret <= 1) { + perror("read "); + return ret; + } + + return e1inp_rx_ts_lapd(e1i_ts, msg); +} + +static void +timeout_ts_sign_write(void *data) +{ + struct e1inp_ts *e1i_ts = (struct e1inp_ts *)data; + + /* trigger write of ts1, due to tx delay timer */ + e1d_want_write(e1i_ts); +} + +static int +handle_ts_sign_write(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct e1inp_sign_link *sign_link; + struct msgb *msg; + + bfd->when &= ~BSC_FD_WRITE; + + /* get the next msg for this timeslot */ + msg = e1inp_tx_ts(e1i_ts, &sign_link); + if (!msg) { + /* no message after tx delay timer */ + return 0; + } + + DEBUGP(DLMI, "TX: %s\n", osmo_hexdump(msg->data, msg->len)); + lapd_transmit(e1i_ts->lapd, sign_link->tei, + sign_link->sapi, msg); + + /* set tx delay timer for next event */ + osmo_timer_setup(&e1i_ts->sign.tx_timer, timeout_ts_sign_write, e1i_ts); + osmo_timer_schedule(&e1i_ts->sign.tx_timer, 0, 50000); + + return 0; +} + + +static void +e1d_write_msg(struct msgb *msg, void *cbdata) +{ + struct osmo_fd *bfd = cbdata; + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + int ret; + + ret = write(bfd->fd, msg->data, msg->len); + msgb_free(msg); + if (ret < 0) + LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); +} + +static int +e1d_fd_cb(struct osmo_fd *bfd, unsigned int what) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + unsigned int idx = ts_nr-1; + struct e1inp_ts *e1i_ts = &line->ts[idx]; + int ret = 0; + + switch (e1i_ts->type) { + case E1INP_TS_TYPE_SIGN: + //if (what & BSC_FD_EXCEPT) + //FIXME: what to do ?!?! + if (what & BSC_FD_READ) + ret = handle_ts_sign_read(bfd); + if (what & BSC_FD_WRITE) + ret = handle_ts_sign_write(bfd); + break; + default: + LOGP(DLINP, LOGL_NOTICE, + "unknown/unsupported E1 TS type %u\n", e1i_ts->type); + break; + } + + return ret; +} + + +static int +e1d_want_write(struct e1inp_ts *e1i_ts) +{ + /* We never include the DAHDI B-Channel FD into the writeset */ + if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { + LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); + return 0; + } + + e1i_ts->driver.e1d.fd.when |= BSC_FD_WRITE; + + return 0; +} + +static int +e1d_line_update(struct e1inp_line *line) +{ + int ts; + int ret; + + if (line->driver != &e1d_driver) + return -EINVAL; + + + LOGP(DLINP, LOGL_ERROR, "Line update %d %d %d\n", line->num, line->port_nr, line->num_ts); + + for (ts=1; tsnum_ts; ts++) + { + unsigned int idx = ts-1; + struct e1inp_ts *e1i_ts = &line->ts[idx]; + struct osmo_fd *bfd = &e1i_ts->driver.e1d.fd; + + /* unregister FD if it was already registered */ + if (bfd->list.next && bfd->list.next != LLIST_POISON1) + osmo_fd_unregister(bfd); + + bfd->data = line; + bfd->priv_nr = ts; + bfd->cb = e1d_fd_cb; + + switch (e1i_ts->type) { + case E1INP_TS_TYPE_NONE: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + if (bfd->fd) { + close(bfd->fd); + bfd->fd = 0; + } + continue; + case E1INP_TS_TYPE_SIGN: + if (bfd->fd <= 0) + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, 0, 0, ts, E1DP_TSMODE_HDLCFCS); + if (bfd->fd < 0) { + LOGP(DLINP, LOGL_ERROR, + "Could not open timeslot %d\n", ts); + return -EIO; + } + bfd->when = BSC_FD_READ | BSC_FD_EXCEPT; + + if (!e1i_ts->lapd) + e1i_ts->lapd = lapd_instance_alloc(1, + e1d_write_msg, bfd, e1inp_dlsap_up, + e1i_ts, &lapd_profile_abis); + break; + case E1INP_TS_TYPE_HDLC: + break; + case E1INP_TS_TYPE_TRAU: + break; + case E1INP_TS_TYPE_RAW: + break; + }; + + ret = osmo_fd_register(bfd); + if (ret < 0) { + LOGP(DLINP, LOGL_ERROR, + "could not register FD: %s\n", + strerror(ret)); + return ret; + } + } + + return 0; +} + +static void +e1d_vty_show(struct vty *vty, struct e1inp_line *line) +{ + /* FIXME */ + vty_out(vty, "Not supported yet%s", VTY_NEWLINE); +} + + +struct e1inp_driver e1d_driver = { + .name = "e1d", + .want_write = e1d_want_write, + .line_update = e1d_line_update, + .vty_show = e1d_vty_show, +}; + +int +e1inp_e1d_init(void) +{ + /* Connect to daemon */ + g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); + if (!g_e1d) { + LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); + return -EPIPE; + } + + /* register the driver with the core */ + return e1inp_driver_register(&e1d_driver); +} + +#endif /* HAVE_E1D */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia0431c124e3b5b4108aee7b109d8c4bb0d8b45d4 Gerrit-Change-Number: 14867 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:38 +0000 Subject: Change in libosmo-abis[master]: e1d: Use HAVE_E1D in C source, not ENABLE_E1D In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14868 ) Change subject: e1d: Use HAVE_E1D in C source, not ENABLE_E1D ...................................................................... e1d: Use HAVE_E1D in C source, not ENABLE_E1D The config.h files contains HAVE_E1D. Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 --- M src/e1_input.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/e1_input.c b/src/e1_input.c index cb1612d..f27b2bb 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -890,7 +890,7 @@ #ifdef HAVE_DAHDI_USER_H e1inp_dahdi_init(); #endif -#ifdef ENABLE_E1D +#ifdef HAVE_E1D e1inp_e1d_init(); #endif e1inp_ipaccess_init(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7d2db6703300b7d537c78ad9285948673d8b1d3 Gerrit-Change-Number: 14868 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:39 +0000 Subject: Change in libosmo-abis[master]: e1d: add missing forward-declaration of e1inp_e1d_init() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14869 ) Change subject: e1d: add missing forward-declaration of e1inp_e1d_init() ...................................................................... e1d: add missing forward-declaration of e1inp_e1d_init() Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd --- M src/e1_input.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/e1_input.c b/src/e1_input.c index f27b2bb..ad4e25c 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -875,6 +875,7 @@ void e1inp_misdn_init(void); void e1inp_dahdi_init(void); +void e1inp_e1d_init(void); void e1inp_ipaccess_init(void); void e1inp_rs232_init(void); void e1inp_unixsocket_init(void); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0060e2c9772eb5c0293712cb0da7cc0477eb8abd Gerrit-Change-Number: 14869 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:40 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't use perror() directly, use osmocom logging instead In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16819 ) Change subject: e1d: Don't use perror() directly, use osmocom logging instead ...................................................................... e1d: Don't use perror() directly, use osmocom logging instead Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 --- M src/input/e1d.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index ceeb0c2..787bf49 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -66,13 +66,13 @@ ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16); if (ret < 0) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret); if (ret <= 1) { - perror("read "); + LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I98f337f8f517b98f9b78dc173e5761687609abd8 Gerrit-Change-Number: 16819 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:40 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove EXCEPTFD handling In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16820 ) Change subject: e1d: Remove EXCEPTFD handling ...................................................................... e1d: Remove EXCEPTFD handling The file decscriptor 'except' handling was only added in the DAHDI input module as the DAHDI kernel side is actually using those. I don't think we can even use this in any way over unix domain sockets. Change-Id: I718629179181a1de3b82e23447549f593046d91f --- M src/input/e1d.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index 787bf49..bbbf8d5 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -144,8 +144,6 @@ switch (e1i_ts->type) { case E1INP_TS_TYPE_SIGN: - //if (what & BSC_FD_EXCEPT) - //FIXME: what to do ?!?! if (what & BSC_FD_READ) ret = handle_ts_sign_read(bfd); if (what & BSC_FD_WRITE) @@ -221,7 +219,7 @@ "Could not open timeslot %d\n", ts); return -EIO; } - bfd->when = BSC_FD_READ | BSC_FD_EXCEPT; + bfd->when = BSC_FD_READ; if (!e1i_ts->lapd) e1i_ts->lapd = lapd_instance_alloc(1, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I718629179181a1de3b82e23447549f593046d91f Gerrit-Change-Number: 16820 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Remove bogus vty_show function. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16821 ) Change subject: e1d: Remove bogus vty_show function. ...................................................................... e1d: Remove bogus vty_show function. It's optional for an input driver to provide this function, and e.g. mISDN doesn't provide it, either. Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 --- M src/input/e1d.c 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index bbbf8d5..c15c081 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -246,19 +246,10 @@ return 0; } -static void -e1d_vty_show(struct vty *vty, struct e1inp_line *line) -{ - /* FIXME */ - vty_out(vty, "Not supported yet%s", VTY_NEWLINE); -} - - struct e1inp_driver e1d_driver = { .name = "e1d", .want_write = e1d_want_write, .line_update = e1d_line_update, - .vty_show = e1d_vty_show, }; int -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I56ed4244121f2019ece80d15bd07d5a8ce958273 Gerrit-Change-Number: 16821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Use line->port_nr to specify e1d interface/line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16822 ) Change subject: e1d: Use line->port_nr to specify e1d interface/line ...................................................................... e1d: Use line->port_nr to specify e1d interface/line This way we can support more than one E1 line via osmo-e1d. As neither mISDN nor DAHDI distinguish between mutliple cards of single ports vs. multi-port cards, we havee to map both interface + line number into a single uint8_t. Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 --- M src/input/e1d.c 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index c15c081..e111d14 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -179,11 +179,17 @@ int ts; int ret; + /* we use higher 4 bits for interface, lower 4 bits for line, + * resulting in max. 16 interfaces with 16 lines each */ + uint8_t e1d_intf = (line->port_nr >> 4) & 0xF; + uint8_t e1d_line = line->port_nr & 0xF; + if (line->driver != &e1d_driver) return -EINVAL; - LOGP(DLINP, LOGL_ERROR, "Line update %d %d %d\n", line->num, line->port_nr, line->num_ts); + LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + e1d_intf, e1d_line, line->num_ts); for (ts=1; tsnum_ts; ts++) { @@ -212,8 +218,10 @@ } continue; case E1INP_TS_TYPE_SIGN: - if (bfd->fd <= 0) - bfd->fd = osmo_e1dp_client_ts_open(g_e1d, 0, 0, ts, E1DP_TSMODE_HDLCFCS); + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_HDLCFCS); + } if (bfd->fd < 0) { LOGP(DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 Gerrit-Change-Number: 16822 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Use LOGPIL/LOGPITS logging macros to give context In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16823 ) Change subject: e1d: Use LOGPIL/LOGPITS logging macros to give context ...................................................................... e1d: Use LOGPIL/LOGPITS logging macros to give context Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 --- M src/input/e1d.c 1 file changed, 9 insertions(+), 13 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index e111d14..2b67141 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -66,13 +66,13 @@ ret = read(bfd->fd, msg->data, TS_SIGN_ALLOC_SIZE - 16); if (ret < 0) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } msgb_put(msg, ret); if (ret <= 1) { - LOGP(DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "%s read failed %d (%s)\n", __func__, ret, strerror(errno)); return ret; } @@ -130,7 +130,7 @@ ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); if (ret < 0) - LOGP(DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); + LOGPITS(e1i_ts, DLMI, LOGL_NOTICE, "%s write failed %d\n", __func__, ret); } static int @@ -150,8 +150,7 @@ ret = handle_ts_sign_write(bfd); break; default: - LOGP(DLINP, LOGL_NOTICE, - "unknown/unsupported E1 TS type %u\n", e1i_ts->type); + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type); break; } @@ -164,7 +163,7 @@ { /* We never include the DAHDI B-Channel FD into the writeset */ if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { - LOGP(DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -188,7 +187,7 @@ return -EINVAL; - LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, + LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); for (ts=1; tsnum_ts; ts++) @@ -223,8 +222,7 @@ E1DP_TSMODE_HDLCFCS); } if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, - "Could not open timeslot %d\n", ts); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); return -EIO; } bfd->when = BSC_FD_READ; @@ -244,9 +242,7 @@ ret = osmo_fd_register(bfd); if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, - "could not register FD: %s\n", - strerror(ret)); + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); return ret; } } @@ -266,7 +262,7 @@ /* Connect to daemon */ g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); if (!g_e1d) { - LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); + LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); return -EPIPE; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88ba83783ae1d8368990ec30cdc7ecff88884e41 Gerrit-Change-Number: 16823 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:41 +0000 Subject: Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16824 ) Change subject: e1d: Don't connect to e1d at program start time ...................................................................... e1d: Don't connect to e1d at program start time Let's not print an error at program/library start time if osmo-e1d cannot be reached. This error is confusing to everyone who may have a libosmo-abis with e1d support compiled in, but who is not (currently) using any lines via this driver, but others drivers. Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 --- M src/input/e1d.c 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index 2b67141..c32e330 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -186,6 +186,14 @@ if (line->driver != &e1d_driver) return -EINVAL; + if (!g_e1d) { + /* Connect to daemon */ + g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); + if (!g_e1d) { + LOGPIL(line, DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); + return -EPIPE; + } + } LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); @@ -259,13 +267,6 @@ int e1inp_e1d_init(void) { - /* Connect to daemon */ - g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl"); - if (!g_e1d) { - LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n"); - return -EPIPE; - } - /* register the driver with the core */ return e1inp_driver_register(&e1d_driver); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 Gerrit-Change-Number: 16824 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 14:37:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 14:37:42 +0000 Subject: Change in libosmo-abis[master]: e1d: Implement varions non-LAPD timeslot modes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16825 ) Change subject: e1d: Implement varions non-LAPD timeslot modes ...................................................................... e1d: Implement varions non-LAPD timeslot modes So far, the e1d input driver only contained code for LAPD signaling slots, let's extend it with support for all the other slot types, as well as support for run-time re-configuration. Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a --- M src/input/e1d.c 1 file changed, 61 insertions(+), 1 deletion(-) Approvals: tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index c32e330..1e9f3bb 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -182,6 +182,8 @@ * resulting in max. 16 interfaces with 16 lines each */ uint8_t e1d_intf = (line->port_nr >> 4) & 0xF; uint8_t e1d_line = line->port_nr & 0xF; + struct osmo_e1dp_ts_info *ts_info; + int num_ts_info; if (line->driver != &e1d_driver) return -EINVAL; @@ -198,6 +200,12 @@ LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr, e1d_intf, e1d_line, line->num_ts); + ret = osmo_e1dp_client_ts_query(g_e1d, &ts_info, &num_ts_info, e1d_intf, e1d_line, E1DP_INVALID); + if (ret < 0) { + LOGPIL(line, DLINP, LOGL_ERROR, "Cannot query E1D for timeslot information: %d\n", ret); + return -EIO; + } + for (ts=1; tsnum_ts; ts++) { unsigned int idx = ts-1; @@ -212,6 +220,12 @@ bfd->priv_nr = ts; bfd->cb = e1d_fd_cb; + if (e1i_ts->type != E1INP_TS_TYPE_NONE && ts >= num_ts_info) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Timeslot configured, but not existant " + "on E1D side; skipping\n"); + continue; + } + switch (e1i_ts->type) { case E1INP_TS_TYPE_NONE: /* close/release LAPD instance, if any */ @@ -225,12 +239,17 @@ } continue; case E1INP_TS_TYPE_SIGN: + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { + close(bfd->fd); + bfd->fd = 0; + } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, E1DP_TSMODE_HDLCFCS); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + talloc_free(ts_info); return -EIO; } bfd->when = BSC_FD_READ; @@ -241,20 +260,61 @@ e1i_ts, &lapd_profile_abis); break; case E1INP_TS_TYPE_HDLC: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + /* close, if old timeslot mode doesn't match new config */ + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_HDLCFCS) { + close(bfd->fd); + bfd->fd = 0; + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_HDLCFCS); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + talloc_free(ts_info); + return -EIO; + } + bfd->when = BSC_FD_READ; break; case E1INP_TS_TYPE_TRAU: - break; case E1INP_TS_TYPE_RAW: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + /* close, if old timeslot mode doesn't match new config */ + if (bfd->fd > 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_RAW) { + close(bfd->fd); + bfd->fd = 0; + } + if (bfd->fd <= 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_RAW); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + talloc_free(ts_info); + return -EIO; + } + bfd->when = BSC_FD_READ; break; }; ret = osmo_fd_register(bfd); if (ret < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "could not register FD: %s\n", strerror(ret)); + talloc_free(ts_info); return ret; } } + talloc_free(ts_info); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I53369004145681bf9178543fe407dfc75e4ae63a Gerrit-Change-Number: 16825 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:15:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:15:18 +0000 Subject: Change in osmo-bts[master]: rsl.c: Fix compiler error on gcc-9.2.1 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16826 ) Change subject: rsl.c: Fix compiler error on gcc-9.2.1 ...................................................................... rsl.c: Fix compiler error on gcc-9.2.1 rsl.c: In function ?rsl_rx_ipac_XXcx?: rsl.c:2147:39: error: ?%s? directive output may be truncated writing up to 255 bytes into a region of size 28 [-Werror=format-truncation=] 2147 | snprintf(cname, sizeof(cname), "bts@%s", ipstr); | ^~ rsl.c:2147:3: note: ?snprintf? output between 5 and 260 bytes into a destination of size 32 2147 | snprintf(cname, sizeof(cname), "bts@%s", ipstr); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Id982a814f401e304327d25c77666f039bc156c1f --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/16826/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d7e3565..10fb95e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2081,7 +2081,7 @@ } if (dch->c.msg_type == RSL_MT_IPAC_CRCX) { - char cname[32]; + char cname[256+4]; char *ipstr = NULL; if (lchan->abis_ip.rtp_socket) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Rx RSL IPAC CRCX, " -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id982a814f401e304327d25c77666f039bc156c1f Gerrit-Change-Number: 16826 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:31:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:31:00 +0000 Subject: Change in osmo-hlr[master]: Revert "add osmo-mslookup-client program" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16827 ) Change subject: Revert "add osmo-mslookup-client program" ...................................................................... Revert "add osmo-mslookup-client program" This reverts commit 637bbfcd9275f8c47212b29b50110f56ba6397bf, as it is a follow-up commit to Change-Id I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 which causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test. Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 --- M .gitignore M configure.ac M contrib/Makefile.am D contrib/dgsm/Makefile.am D contrib/dgsm/osmo-mslookup-pipe.py D contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am D src/mslookup/osmo-mslookup-client.c 8 files changed, 1 insertion(+), 957 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/16827/1 diff --git a/.gitignore b/.gitignore index 0965935..eec364a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ src/osmo-hlr-db-tool src/osmo-euse-demo src/gsupclient/gsup-test-client -src/mslookup/osmo-mslookup-client tests/atconfig tests/testsuite diff --git a/configure.ac b/configure.ac index 59261e8..57aecba 100644 --- a/configure.ac +++ b/configure.ac @@ -185,7 +185,6 @@ doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile - contrib/dgsm/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cfd0b15..3439c97 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1 @@ -SUBDIRS = \ - systemd \ - dgsm \ - $(NULL) +SUBDIRS = systemd diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am deleted file mode 100644 index c759302..0000000 --- a/contrib/dgsm/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - osmo-mslookup-pipe.py \ - osmo-mslookup-socket.py \ - $(NULL) diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py deleted file mode 100755 index b18bf5f..0000000 --- a/contrib/dgsm/osmo-mslookup-pipe.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python3 -# vim: shiftwidth=4 tabstop=4 expandtab -import subprocess -import json - -def query_mslookup(query_str): - result = {'result': 'not-found'} - proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str), - stdout=subprocess.PIPE) - for line in iter(proc.stdout.readline,''): - if not line: - break - response = json.loads(line) - if response.get('result') == 'result': - result = response - print('Response: %r' % response) - return result - -if __name__ == '__main__': - import sys - query_str = '1000-5000 at sip.voice.12345.msisdn' - if len(sys.argv) > 1: - query_str = sys.argv[1] - print('Final result: %r' % query_mslookup(query_str)) diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py deleted file mode 100755 index a26ad9f..0000000 --- a/contrib/dgsm/osmo-mslookup-socket.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python3 -# vim: shiftwidth=4 tabstop=4 expandtab -import socket -import time - -MSLOOKUP_SOCKET_PATH = '/tmp/mslookup' - -def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH): - mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - mslookup_socket.setblocking(True) - mslookup_socket.connect(socket_path) - result = {'result': 'not-found'} - column_names = mslookup_socket.recv(1024).decode('ascii') - if not column_names: - return result - column_names = column_names.split('\t') - mslookup_socket.sendall(query_str.encode('ascii')) - while True: - csv = mslookup_socket.recv(1024).decode('ascii') - if not csv: - break - response = dict(zip(column_names, csv.split('\t'))) - if response.get('result') == 'result': - result = response - print('Response: %r' % response) - return result - -if __name__ == '__main__': - import sys - print( - '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n') - query_str = '1000-5000 at sip.voice.12345.msisdn' - if len(sys.argv) > 1: - query_str = sys.argv[1] - print('Final result: %r' % query_mslookup_socket(query_str)) diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index a720c40..07fb6f4 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -26,12 +26,3 @@ $(LIBOSMOGSM_LIBS) \ $(TALLOC_LIBS) \ $(NULL) - -bin_PROGRAMS = osmo-mslookup-client -osmo_mslookup_client_SOURCES = osmo-mslookup-client.c -osmo_mslookup_client_LDADD = \ - libosmo-mslookup.la \ - $(LIBOSMOCORE_LIBS) \ - $(TALLOC_LIBS) \ - $(NULL) -osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c deleted file mode 100644 index 1c0efe9..0000000 --- a/src/mslookup/osmo-mslookup-client.c +++ /dev/null @@ -1,879 +0,0 @@ -/*! \file osmo-mslookup-client.c - * Distributed GSM: find the location of subscribers, for example by multicast DNS, - * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names). - */ -/* - * (C) 2019 by sysmocom s.f.m.c. GmbH - * (C) 2019 by Neels Hofmeyr - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port" - -static void print_version(void) -{ - printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION); - printf("\n" - "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n" - "Copyright (C) 2019 by Neels Hofmeyr \n" - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n"); -} - -static void print_help() -{ - print_version(); - printf( -"Standalone mslookup client for Distributed GSM\n" -"\n" -"Receiving mslookup results means listening for responses on a socket. Often,\n" -"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n" -"to read responses, because that interferes with the main program (e.g.\n" -"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n" -"that interferes with osmo_select_main(), or an smpp.py uses\n" -"smpplib.client.listen() as main loop, etc.).\n" -"\n" -"This program provides a trivial solution, by outsourcing the mslookup main loop\n" -"to a separate process. Communication is done via cmdline arg and stdout pipe or\n" -"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n" -"\n" -"This can be done one-shot, i.e. exit as soon as the response has been\n" -"determined, or in daemon form, i.e. continuously listen for requests and return\n" -"responses.\n" -"\n" -"About running a local daemon: it is unintuitive to connect to a socket to solve\n" -"a problem of reading from a socket -- it seems like just more of the same\n" -"problem. The reasons why the daemon is in fact useful are:\n" -"- The osmo-mslookup-client daemon will return only those results matching\n" -" requests issued on that socket connection.\n" -"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n" -" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n" -" to asynchronously receive responses from remote servers.\n" -"- Only one long-lived multicast socket needs to be opened instead of a new\n" -" socket for each request.\n" -"\n" -"Output is in CSV or json, see --format. The default is tab-separated CSV\n" -"with these columns:\n" -CSV_HEADERS "\n" -"\n" -"One-shot operation example:\n" -"$ osmo-mslookup-client 1000- at sip.voice.12345.msisdn -f json\n" -"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n" -"$\n" -"\n" -"Daemon operation example:\n" -"$ osmo-mslookup-client -s /tmp/mslookup -d\n" -"(and a client program then connects to /tmp/mslookup, find an implementation\n" -"example below)\n" -"\n" -"Integrating with calling programs can be done by:\n" -"- call osmo-mslookup-client with the query string as argument.\n" -" It will open a multicast DNS socket, send out a query and wait for the\n" -" matching response. It will print the result on stdout and exit.\n" -" This method launches a new process for every mslookup query,\n" -" and creates a short-lived multicast listener for each invocation.\n" -" This is fine for low activity, but does not scale well.\n" -"\n" -"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n" -" Individual queries can be sent by connecting to that unix domain socket,\n" -" blockingly reading the response when it arrives and disconnecting.\n" -" This way only one process keeps one multicast listener open.\n" -" Callers can connect to this socket without spawning processes.\n" -" This is recommended for scale.\n" -"\n" -"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n" -"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n" -"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n" -"\n" -"\n" -"Options:\n" -"\n" -"[[delay-][timeout]@]service.number.id\n" -" A service query string with optional individual timeout.\n" -" The same format is also used on a daemon socket, if any.\n" -" The timeout consists of the min-delay and the timeout numbers,\n" -" corresponding to the --min-delay and --timeout options, in milliseconds.\n" -" These options apply if a query string lacks own numbers.\n" -" Examples:\n" -" gsup.hlr.1234567.imsi Use cmdline timeout settings\n" -" 5000 at gsup.hlr.1234567.imsi Return N results for 5 seconds\n" -" 1000-5000 at sip.voice.123.msisdn Same, but silent for first second\n" -" 10000- at smpp.sms.567.msisdn Return 1 result after 10 seconds\n" -"\n" -"--format -f csv (default)\n" -" Format result lines in CSV format.\n" -"--no-csv-headers -H\n" -" If the format is 'csv', by default, the first output line prints the\n" -" CSV headers used for CSV output format. This option disables these CSV\n" -" headers.\n" -"\n" -"--format -f json\n" -" Format result lines in json instead of semicolon separated, like:\n" -" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n" -"\n" -"--daemon -d\n" -" Keep running after a request has been serviced\n" -"\n" -"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n" -"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n" -" Set multicast IP address / port to send mDNS requests and listen for\n" -" mDNS reponses\n" -"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n" -" Append this suffix to each mDNS query's domain to avoid colliding with the\n" -" top-level domains administrated by IANA.\n" -"\n" -"--min-delay -t 1000 (in milliseconds)\n" -" Set minimum delay to wait before returning any results.\n" -" When this timeout has elapsed, the best current result is returned,\n" -" if any is available.\n" -" Responses arriving after the min-delay has elapsed which have a younger\n" -" age than previous results are returned immediately.\n" -" Note: When a response with age of zero comes in, the result is returned\n" -" immediately and the request is discarded: non-daemon mode exits, daemon\n" -" mode ignores later results.\n" -"\n" -"--timeout -T 1000 (in milliseconds)\n" -" Set timeout after which to stop listening for responses.\n" -" If this is smaller than -t, the value from -t will be used for -T as well.\n" -" Note: When a response with age of zero comes in, the result is returned\n" -" immediately and the request is discarded: non-daemon mode exits, daemon\n" -" mode ignores later results.\n" -"\n" -"--socket -s /path/to/unix-domain-socket\n" -" Listen to requests from and write responses to a UNIX domain socket.\n" -"\n" -"--send -S \n" -" Do not query, but send an mslookup result. This is useful only for\n" -" testing. Examples:\n" -" --send foo.123.msisdn 300 23.42.17.11 1234\n" -" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n" -" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n" -"\n" -"--quiet -q\n" -" Do not print errors to stderr, do not log to stderr.\n" -"\n" -"--help -h\n" -" This help\n" -); -} - -enum result_format { - FORMAT_CSV = 0, - FORMAT_JSON, -}; - -static struct { - bool daemon; - struct osmo_sockaddr_str mdns_addr; - uint32_t min_delay; - uint32_t timeout; - const char *socket_path; - const char *format_str; - const char *mdns_domain_suffix; - bool csv_headers; - bool send; - bool quiet; -} cmdline_opts = { - .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT }, - .min_delay = 1000, - .timeout = 1000, - .csv_headers = true, - .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT, -}; - -#define print_error(fmt, args...) do { \ - if (!cmdline_opts.quiet) \ - fprintf(stderr, fmt, ##args); \ - } while (0) - -char g_buf[1024]; - -long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc) -{ - long long int val; - char *endptr; - if (rc) - *rc = -1; - if (!arg) - return -1; - errno = 0; - val = strtoll(arg, &endptr, 10); - if (errno || val < minval || val > maxval || *endptr) - return -1; - if (rc) - *rc = 0; - return val; -} - -int cb_doing_nothing(struct osmo_fd *fd, unsigned int what) -{ - return 0; -} - -/* --send: Just send a response, for manual testing. */ -int do_send(int argc, char ** argv) -{ - /* parse args */ -#define ARG(NR) ((argc > NR)? argv[NR] : NULL) - const char *query_str = ARG(0); - const char *age_str = ARG(1); - const char *ip_strs[2][2] = { - { ARG(2), ARG(3) }, - { ARG(4), ARG(5) }, - }; - struct osmo_mslookup_query q = {}; - struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT }; - int i; - int rc; - void *ctx = talloc_named_const(NULL, 0, __func__); - struct osmo_mdns_sock *sock; - - if (!query_str) { - print_error("--send needs a query string like foo.123456.imsi\n"); - return 1; - } - if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) { - print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n", - query_str); - return 1; - } - - if (!age_str) { - print_error("--send needs an age\n"); - return 1; - } - r.age = parse_int(0, UINT32_MAX, age_str, &rc); - if (rc) { - print_error("invalid age\n"); - return 1; - } - - for (i = 0; i < 2; i++) { - struct osmo_sockaddr_str addr; - uint16_t port; - if (!ip_strs[i][0]) - continue; - port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc); - if (rc) { - print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL"); - return 1; - } - if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) { - print_error("invalid IP addr: %s\n", ip_strs[i][0]); - return 1; - } - if (addr.af == AF_INET) - r.host_v4 = addr; - else - r.host_v6 = addr; - } - - printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr), - osmo_mslookup_result_name_c(ctx, &q, &r)); - - rc = 1; - sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, - cb_doing_nothing, NULL, 0); - if (!sock) { - print_error("unable to open mDNS socket\n"); - goto exit_cleanup; - } - - struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); - if (!msg) { - print_error("unable to encode mDNS response\n"); - goto exit_cleanup; - } - - if (osmo_mdns_sock_send(sock, msg)) { - print_error("unable to send mDNS message\n"); - goto exit_cleanup; - } - - rc = 0; -exit_cleanup: - osmo_mdns_sock_cleanup(sock); - talloc_free(ctx); - return rc; -} - -static struct { - void *ctx; - unsigned int requests_handled; - struct osmo_fd socket_ofd; - struct osmo_mslookup_client *mslookup_client; - struct llist_head queries; - struct llist_head socket_clients; - enum result_format format; -} globals = { - .queries = LLIST_HEAD_INIT(globals.queries), - .socket_clients = LLIST_HEAD_INIT(globals.socket_clients), -}; - -typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r); - -void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) -{ - struct osmo_strbuf sb = { .buf=buf, .len=buflen }; - OSMO_STRBUF_PRINTF(sb, "%s", query_str); - - if (!r) - OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t"); - else { - OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc)); - OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last"); - OSMO_STRBUF_PRINTF(sb, "\t%u", r->age); - switch (r->rc) { - case OSMO_MSLOOKUP_RC_RESULT: - if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) - OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port); - else - OSMO_STRBUF_PRINTF(sb, "\t\t"); - if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) - OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port); - else - OSMO_STRBUF_PRINTF(sb, "\t\t"); - break; - default: - OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t"); - break; - } - } -} - -void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) -{ - struct osmo_strbuf sb = { .buf=buf, .len=buflen }; - OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str); - - if (!r) - OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\""); - else { - OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc)); - OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false"); - OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age); - if (r->rc == OSMO_MSLOOKUP_RC_RESULT) { - if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) - OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port); - if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) - OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port); - } - } - OSMO_STRBUF_PRINTF(sb, "}"); -} - -formatter_t formatters[] = { - [FORMAT_CSV] = formatter_csv, - [FORMAT_JSON] = formatter_json, -}; - -void respond_str_stdout(const char *str) { - fprintf(stdout, "%s\n", str); - fflush(stdout); -} - -void start_query_str(const char *query_str); -void start_query_strs(char **query_strs, size_t query_strs_len); - -struct socket_client { - struct llist_head entry; - struct osmo_fd ofd; - char query_str[1024]; -}; - -static void socket_client_close(struct socket_client *c) -{ - struct osmo_fd *ofd = &c->ofd; - - close(ofd->fd); - ofd->fd = -1; - osmo_fd_unregister(ofd); - - llist_del(&c->entry); - talloc_free(c); -} - -void socket_client_respond_result(struct socket_client *c, const char *response) -{ - write(c->ofd.fd, response, strlen(response)); -} - -static int socket_read_cb(struct osmo_fd *ofd) -{ - struct socket_client *c = ofd->data; - int rc; - char rxbuf[1024]; - char *query_with_timeout; - char *query_str; - char *at; - - rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0); - if (rc == 0) - goto close; - - if (rc < 0) { - if (errno == EAGAIN) - return 0; - goto close; - } - - if (rc >= sizeof(c->query_str)) - goto close; - - rxbuf[rc] = '\0'; - query_with_timeout = strtok(rxbuf, "\r\n"); - at = strchr(query_with_timeout, '@'); - query_str = at ? at + 1 : query_with_timeout; - - if (c->query_str[0]) { - print_error("ERROR: Only one query per client connect is allowed;" - " received '%s' and '%s' on the same connection\n", - c->query_str, query_str); - formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL); - socket_client_respond_result(c, g_buf); - return 0; - } - - OSMO_STRLCPY_ARRAY(c->query_str, query_str); - start_query_str(query_with_timeout); - printf("query: %s\n", query_with_timeout); - return rc; - -close: - socket_client_close(c); - return -1; -} - -static int socket_cb(struct osmo_fd *ofd, unsigned int flags) -{ - int rc = 0; - - if (flags & BSC_FD_READ) - rc = socket_read_cb(ofd); - if (rc < 0) - return rc; - - return rc; -} - -int socket_accept(struct osmo_fd *ofd, unsigned int flags) -{ - struct socket_client *c; - struct sockaddr_un un_addr; - socklen_t len; - int rc; - - len = sizeof(un_addr); - rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len); - if (rc < 0) { - print_error("Failed to accept a new connection\n"); - return -1; - } - - c = talloc_zero(globals.ctx, struct socket_client); - OSMO_ASSERT(c); - c->ofd.fd = rc; - c->ofd.when = BSC_FD_READ; - c->ofd.cb = socket_cb; - c->ofd.data = c; - - if (osmo_fd_register(&c->ofd) != 0) { - print_error("Failed to register new connection fd\n"); - close(c->ofd.fd); - c->ofd.fd = -1; - talloc_free(c); - return -1; - } - - llist_add(&c->entry, &globals.socket_clients); - - if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) - write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); - - return 0; -} - -int socket_init(const char *sock_path) -{ - struct osmo_fd *ofd = &globals.socket_ofd; - int rc; - - ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND); - if (ofd->fd < 0) { - print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno)); - return -1; - } - - ofd->when = BSC_FD_READ; - ofd->cb = socket_accept; - - rc = osmo_fd_register(ofd); - if (rc < 0) { - print_error("Could not register listen fd: %d\n", rc); - close(ofd->fd); - return rc; - } - return 0; -} - -void socket_close() -{ - struct socket_client *c, *n; - llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) - socket_client_close(c); - if (osmo_fd_is_registered(&globals.socket_ofd)) { - close(globals.socket_ofd.fd); - globals.socket_ofd.fd = -1; - osmo_fd_unregister(&globals.socket_ofd); - } -} - -struct query { - struct llist_head entry; - - char query_str[128]; - struct osmo_mslookup_query query; - uint32_t handle; -}; - -void respond_result(const char *query_str, const struct osmo_mslookup_result *r) -{ - struct socket_client *c, *n; - formatters[globals.format](g_buf, sizeof(g_buf), query_str, r); - respond_str_stdout(g_buf); - - llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) { - if (!strcmp(query_str, c->query_str)) { - socket_client_respond_result(c, g_buf); - if (r->last) - socket_client_close(c); - } - } - if (r->last) - globals.requests_handled++; -} - -void respond_err(const char *query_str) -{ - respond_result(query_str, NULL); -} - -struct query *query_by_handle(uint32_t request_handle) -{ - struct query *q; - llist_for_each_entry(q, &globals.queries, entry) { - if (request_handle == q->handle) - return q; - } - return NULL; -} - -void mslookup_result_cb(struct osmo_mslookup_client *client, - uint32_t request_handle, - const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result) -{ - struct query *q = query_by_handle(request_handle); - if (!q) - return; - respond_result(q->query_str, result); - if (result->last) { - llist_del(&q->entry); - talloc_free(q); - } -} - -void start_query_str(const char *query_str) -{ - struct query *q; - const char *domain_str = query_str; - char *at; - struct osmo_mslookup_query_handling h = { - .min_wait_milliseconds = cmdline_opts.min_delay, - .result_timeout_milliseconds = cmdline_opts.timeout, - .result_cb = mslookup_result_cb, - }; - - at = strchr(query_str, '@'); - if (at) { - int rc; - char timeouts[16]; - char *dash; - char *timeout; - - domain_str = at + 1; - - h.min_wait_milliseconds = h.result_timeout_milliseconds = 0; - - if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) { - print_error("ERROR: timeouts part too long in query string\n"); - respond_err(domain_str); - return; - } - - dash = strchr(timeouts, '-'); - if (dash) { - char min_delay[16]; - osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts); - h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc); - if (rc) { - print_error("ERROR: invalid min-delay number: %s\n", min_delay); - respond_err(domain_str); - return; - } - timeout = dash + 1; - } else { - timeout = timeouts; - } - if (*timeout) { - h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc); - if (rc) { - print_error("ERROR: invalid timeout number: %s\n", timeout); - respond_err(domain_str); - return; - } - } - } - - if (strlen(domain_str) >= sizeof(q->query_str)) { - print_error("ERROR: query string is too long: '%s'\n", domain_str); - respond_err(domain_str); - return; - } - - q = talloc_zero(globals.ctx, struct query); - OSMO_ASSERT(q); - OSMO_STRLCPY_ARRAY(q->query_str, domain_str); - - if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) { - print_error("ERROR: cannot parse query string: '%s'\n", domain_str); - respond_err(domain_str); - talloc_free(q); - return; - } - - q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h); - if (!q->handle) { - print_error("ERROR: cannot send query: '%s'\n", domain_str); - respond_err(domain_str); - talloc_free(q); - return; - } - - llist_add(&q->entry, &globals.queries); -} - -void start_query_strs(char **query_strs, size_t query_strs_len) -{ - int i; - for (i = 0; i < query_strs_len; i++) - start_query_str(query_strs[i]); -} - -int main(int argc, char **argv) -{ - int rc = EXIT_FAILURE; - globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client"); - - osmo_init_logging2(globals.ctx, NULL); - log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); - log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); - log_set_print_level(osmo_stderr_target, 1); - log_set_print_category(osmo_stderr_target, 1); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_print_extended_timestamp(osmo_stderr_target, 1); - log_set_use_color(osmo_stderr_target, 0); - - while (1) { - int c; - long long int val; - char *endptr; - int option_index = 0; - - static struct option long_options[] = { - { "format", 1, 0, 'f' }, - { "no-csv-headers", 0, 0, 'H' }, - { "daemon", 0, 0, 'd' }, - { "mdns-ip", 1, 0, 'm' }, - { "mdns-port", 1, 0, 'M' }, - { "mdns-domain-suffix", 1, 0, 'D' }, - { "timeout", 1, 0, 'T' }, - { "min-delay", 1, 0, 't' }, - { "socket", 1, 0, 's' }, - { "send", 0, 0, 'S' }, - { "quiet", 0, 0, 'q' }, - { "help", 0, 0, 'h' }, - { "version", 0, 0, 'V' }, - {} - }; - -#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \ - int _rc; \ - TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \ - if (_rc) { \ - print_error("Invalid " #TARGET ": %s\n", optarg); \ - goto program_exit; \ - } \ - } while (0) - - c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index); - - if (c == -1) - break; - - switch (c) { - case 'f': - cmdline_opts.format_str = optarg; - break; - case 'H': - cmdline_opts.csv_headers = false; - break; - case 'd': - cmdline_opts.daemon = true; - break; - case 'm': - if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port) - || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) { - print_error("Invalid mDNS IP address: %s\n", optarg); - goto program_exit; - } - break; - case 'M': - PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535); - break; - case 'D': - cmdline_opts.mdns_domain_suffix = optarg; - break; - case 't': - PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX); - break; - case 'T': - PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX); - break; - case 's': - cmdline_opts.socket_path = optarg; - break; - case 'S': - cmdline_opts.send = true; - break; - case 'q': - cmdline_opts.quiet = true; - break; - - case 'h': - print_help(); - rc = 0; - goto program_exit; - case 'V': - print_version(); - rc = 0; - goto program_exit; - - default: - /* catch unknown options *as well as* missing arguments. */ - print_error("Error in command line options. Exiting.\n"); - goto program_exit; - } - } - - if (cmdline_opts.send) { - if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) { - print_error("--send option cannot have any listening related args."); - } - rc = do_send(argc - optind, argv + optind); - goto program_exit; - } - - if (!cmdline_opts.daemon && !(argc - optind)) { - print_help(); - goto program_exit; - } - - if (cmdline_opts.daemon && !cmdline_opts.timeout) { - print_error("In daemon mode, --timeout must not be zero.\n"); - goto program_exit; - } - - if (cmdline_opts.quiet) - log_target_destroy(osmo_stderr_target); - - if (cmdline_opts.format_str) { - if (osmo_str_startswith("json", cmdline_opts.format_str)) - globals.format = FORMAT_JSON; - else if (osmo_str_startswith("csv", cmdline_opts.format_str)) - globals.format = FORMAT_CSV; - else { - print_error("Invalid format: %s\n", cmdline_opts.format_str); - goto program_exit; - } - } - - if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) - respond_str_stdout(CSV_HEADERS); - - globals.mslookup_client = osmo_mslookup_client_new(globals.ctx); - if (!globals.mslookup_client - || !osmo_mslookup_client_add_mdns(globals.mslookup_client, - cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, - -1, cmdline_opts.mdns_domain_suffix)) { - print_error("Failed to start mDNS client\n"); - goto program_exit; - } - - if (cmdline_opts.socket_path) { - if (socket_init(cmdline_opts.socket_path)) - goto program_exit; - } - - start_query_strs(&argv[optind], argc - optind); - - while (1) { - osmo_select_main_ctx(0); - - if (!cmdline_opts.daemon - && globals.requests_handled - && llist_empty(&globals.queries)) - break; - } - - rc = 0; -program_exit: - osmo_mslookup_client_free(globals.mslookup_client); - socket_close(); - log_fini(); - talloc_free(globals.ctx); - return rc; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 Gerrit-Change-Number: 16827 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:31:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:31:00 +0000 Subject: Change in osmo-hlr[master]: Revert "add mDNS lookup method to libosmo-mslookup" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16828 ) Change subject: Revert "add mDNS lookup method to libosmo-mslookup" ...................................................................... Revert "add mDNS lookup method to libosmo-mslookup" This reverts commit f10463c5fc6d9e786ab7c648d99f7450f9a25906, as it causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test. Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am D include/osmocom/mslookup/Makefile.am D include/osmocom/mslookup/mdns.h D include/osmocom/mslookup/mdns_msg.h D include/osmocom/mslookup/mdns_rfc.h D include/osmocom/mslookup/mdns_sock.h D include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am D src/mslookup/mdns.c D src/mslookup/mdns_msg.c D src/mslookup/mdns_rfc.c D src/mslookup/mdns_sock.c D src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am D tests/mslookup/mdns_test.c D tests/mslookup/mdns_test.err D tests/mslookup/mslookup_client_mdns_test.c D tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 0 insertions(+), 2,829 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/16828/1 diff --git a/.gitignore b/.gitignore index eec364a..acfea84 100644 --- a/.gitignore +++ b/.gitignore @@ -51,8 +51,6 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump -tests/mslookup/mdns_test -tests/mslookup/mslookup_client_mdns_test tests/mslookup/mslookup_client_test tests/mslookup/mslookup_test diff --git a/configure.ac b/configure.ac index 57aecba..217df9f 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,6 @@ include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile - include/osmocom/mslookup/Makefile libosmo-gsup-client.pc libosmo-mslookup.pc sql/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 9827950..e9a7126 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,10 +2,7 @@ nobase_include_HEADERS = \ osmocom/gsupclient/gsup_client.h \ - osmocom/mslookup/mdns.h \ - osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ - osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index b75c86a..dbc2344 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = \ hlr \ - mslookup \ $(NULL) diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am deleted file mode 100644 index 72ccd94..0000000 --- a/include/osmocom/mslookup/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# most headers here are installed, see /include/Makefile.am - -noinst_HEADERS = \ - mdns_msg.h \ - mdns_rfc.h \ - $(NULL) diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h deleted file mode 100644 index b62e95f..0000000 --- a/include/osmocom/mslookup/mdns.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/*! \file mdns.h */ - -#pragma once - -#include -#include - -#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org" - -struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const char *domain_suffix); - -struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, - uint16_t *packet_id, const char *domain_suffix); - -struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result, const char *domain_suffix); - -int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, - struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, - const char *domain_suffix); diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h deleted file mode 100644 index ae7dd17..0000000 --- a/include/osmocom/mslookup/mdns_msg.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include -#include "mdns_rfc.h" - -struct osmo_mdns_record { - struct llist_head list; - enum osmo_mdns_rfc_record_type type; - uint16_t length; - uint8_t *data; -}; - -struct osmo_mdns_msg_request { - uint16_t id; - char *domain; - enum osmo_mdns_rfc_record_type type; -}; - -struct osmo_mdns_msg_answer { - uint16_t id; - char *domain; - /*! list of osmo_mdns_record. */ - struct llist_head records; -}; - -int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req); -struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len); - -void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer); -int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans); -struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len); -int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans); - -struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...); -int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, - char *key_buf, size_t key_size, char *value_buf, size_t value_size); diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h deleted file mode 100644 index 9d6be5a..0000000 --- a/include/osmocom/mslookup/mdns_rfc.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include - -/* RFC 1035 2.3.4 */ -#define OSMO_MDNS_RFC_MAX_NAME_LEN 255 - -/* RFC 1035 3.3 */ -#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256 - -enum osmo_mdns_rfc_record_type { - OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0, - - /* RFC 1035 3.2.2 */ - OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */ - OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */ - - /* RFC 3596 2.1 */ - OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */ - - /* RFC 1035 3.2.3 */ - OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */ -}; - -enum osmo_mdns_rfc_class { - OSMO_MDNS_RFC_CLASS_UNKNOWN = 0, - - /* RFC 1035 3.2.4 */ - OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */ - - /* RFC 1035 3.2.5 */ - OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */ -}; - -/* RFC 1035 4.1.1 */ -struct osmo_mdns_rfc_header { -#if OSMO_IS_LITTLE_ENDIAN - uint16_t id; - uint8_t rd:1, - tc:1, - aa:1, - opcode:4, - qr:1; /* QR (0: query, 1: response) */ - uint8_t rcode:4, - z:3, - ra:1; - uint16_t qdcount; /* Number of questions */ - uint16_t ancount; /* Number of answers */ - uint16_t nscount; /* Number of authority records */ - uint16_t arcount; /* Number of additional records */ -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint16_t id; - uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1; - uint8_t ra:1, z:3, rcode:4; - uint16_t qdcount; - uint16_t ancount; - uint16_t nscount; - uint16_t arcount; -#endif -} __attribute__ ((packed)); - -/* RFC 1035 4.1.2 */ -struct osmo_mdns_rfc_question { - char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */ - enum osmo_mdns_rfc_record_type qtype; - enum osmo_mdns_rfc_class qclass; -}; - -/* RFC 1035 4.1.3 */ -struct osmo_mdns_rfc_record { - char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */ - enum osmo_mdns_rfc_record_type type; - enum osmo_mdns_rfc_class class; - uint32_t ttl; - uint16_t rdlength; - uint8_t *rdata; -}; - -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); - -void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); -int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); - -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); -struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); - -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); -struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, - size_t *record_len); diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h deleted file mode 100644 index 615e971..0000000 --- a/include/osmocom/mslookup/mdns_sock.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once -#include -#include -#include - -struct osmo_mdns_sock { - struct osmo_fd osmo_fd; - struct addrinfo *ai; -}; - -struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, - int (*cb)(struct osmo_fd *fd, unsigned int what), - void *data, unsigned int priv_nr); -int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg); -void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock); diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h deleted file mode 100644 index e699107..0000000 --- a/include/osmocom/mslookup/mslookup_client_mdns.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include - -struct osmo_mslookup_client; -struct osmo_mslookup_client_method; - -/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational - * Scoped range, https://tools.ietf.org/html/rfc2365 . */ -#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42" -#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane? -#define OSMO_MSLOOKUP_MDNS_PORT 4266 - -struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, - uint16_t port, int initial_packet_id, - const char *domain_suffix); - -const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method); - -const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method); diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 07fb6f4..01be401 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -10,14 +10,9 @@ lib_LTLIBRARIES = libosmo-mslookup.la libosmo_mslookup_la_SOURCES = \ - mdns.c \ - mdns_msg.c \ - mdns_rfc.c \ - mdns_sock.c \ mslookup.c \ mslookup_client.c \ mslookup_client_fake.c \ - mslookup_client_mdns.c \ $(NULL) libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c deleted file mode 100644 index 4742a7c..0000000 --- a/src/mslookup/mdns.c +++ /dev/null @@ -1,425 +0,0 @@ -/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high - * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include - -static struct msgb *osmo_mdns_msgb_alloc(const char *label) -{ - return msgb_alloc(1024, label); -} - -/*! Combine the mslookup query service, ID and ID type into a domain string. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success, - * NULL on failure. - */ -static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix) -{ - const char *id; - - /* Get id from query */ - switch (query->id.type) { - case OSMO_MSLOOKUP_ID_IMSI: - id = query->id.imsi; - break; - case OSMO_MSLOOKUP_ID_MSISDN: - id = query->id.msisdn; - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type); - return NULL; - } - - return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type), - domain_suffix); -} - -/*! Split up query service, ID and ID type from a domain string into a mslookup query. - * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org" - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we - * remove it in this function. Example: "mdns.osmocom.org" - */ -int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix) -{ - int domain_len = strlen(domain) - strlen(domain_suffix) - 1; - char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN]; - - if (domain_len <= 0 || domain_len >= sizeof(domain_buf)) - return -EINVAL; - - if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0) - return -EINVAL; - - memcpy(domain_buf, domain, domain_len); - domain_buf[domain_len] = '\0'; - return osmo_mslookup_query_init_from_domain_str(query, domain_buf); -} - -/*! Encode a mslookup query into a mDNS packet. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns msgb, or NULL on error. - */ -struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const char *domain_suffix) -{ - struct osmo_mdns_msg_request req = {0}; - struct msgb *msg = osmo_mdns_msgb_alloc(__func__); - - req.id = packet_id; - req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL; - req.domain = domain_from_query(ctx, query, domain_suffix); - if (!req.domain) - goto error; - if (osmo_mdns_msg_request_encode(ctx, msg, &req)) - goto error; - talloc_free(req.domain); - return msg; -error: - msgb_free(msg); - talloc_free(req.domain); - return NULL; -} - -/*! Decode a mDNS request packet into a mslookup query. - * \param[out] packet_id the result must be sent with the same packet_id. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns allocated mslookup query on success, NULL on error. - */ -struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, - uint16_t *packet_id, const char *domain_suffix) -{ - struct osmo_mdns_msg_request *req = NULL; - struct osmo_mslookup_query *query = NULL; - - req = osmo_mdns_msg_request_decode(ctx, data, data_len); - if (!req) - return NULL; - - query = talloc_zero(ctx, struct osmo_mslookup_query); - OSMO_ASSERT(query); - if (query_from_domain(query, req->domain, domain_suffix) < 0) - goto error_free; - - *packet_id = req->id; - talloc_free(req); - return query; -error_free: - talloc_free(req); - talloc_free(query); - return NULL; -} - -/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it. - * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str. - * \param[in] rec single record of the abstracted list of mDNS records - * \returns 0 on success, -EINVAL on error. - */ -static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec) -{ - switch (rec->type) { - case OSMO_MDNS_RFC_RECORD_TYPE_A: - if (rec->length != 4) { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n"); - return -EINVAL; - } - osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0); - break; - case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: - if (rec->length != 16) { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n"); - return -EINVAL; - } - osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0); - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); - return -EINVAL; - } - return 0; -} - -/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet. - * - * The records in the packet are ordered as follows: - * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or - * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). - * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. - * - * \param[in] packet_id as received in osmo_mdns_query_decode(). - * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn"). - * \param[in] result holds the age, IPs and ports of the queried service. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns msg on success, NULL on error. - */ -struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result, const char *domain_suffix) -{ - struct osmo_mdns_msg_answer ans = {}; - struct osmo_mdns_record *rec_age = NULL; - struct osmo_mdns_record rec_ip_v4 = {0}; - struct osmo_mdns_record rec_ip_v6 = {0}; - struct osmo_mdns_record *rec_ip_v4_port = NULL; - struct osmo_mdns_record *rec_ip_v6_port = NULL; - struct in_addr rec_ip_v4_in; - struct in6_addr rec_ip_v6_in; - struct msgb *msg = osmo_mdns_msgb_alloc(__func__); - char buf[256]; - - ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode"); - - /* Prepare answer (ans) */ - ans.domain = domain_from_query(ctx, query, domain_suffix); - if (!ans.domain) - goto error; - ans.id = packet_id; - INIT_LLIST_HEAD(&ans.records); - - /* Record for age */ - rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age); - OSMO_ASSERT(rec_age); - llist_add_tail(&rec_age->list, &ans.records); - - /* Records for IPv4 */ - if (osmo_sockaddr_str_is_set(&result->host_v4)) { - if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A; - rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in; - rec_ip_v4.length = sizeof(rec_ip_v4_in); - llist_add_tail(&rec_ip_v4.list, &ans.records); - - rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port); - OSMO_ASSERT(rec_ip_v4_port); - llist_add_tail(&rec_ip_v4_port->list, &ans.records); - } - - /* Records for IPv6 */ - if (osmo_sockaddr_str_is_set(&result->host_v6)) { - if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; - rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in; - rec_ip_v6.length = sizeof(rec_ip_v6_in); - llist_add_tail(&rec_ip_v6.list, &ans.records); - - rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port); - OSMO_ASSERT(rec_ip_v6_port); - llist_add_tail(&rec_ip_v6_port->list, &ans.records); - } - - if (osmo_mdns_msg_answer_encode(ctx, msg, &ans)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - talloc_free(ctx); - return msg; -error: - msgb_free(msg); - talloc_free(ctx); - return NULL; -} - -static int decode_uint32_t(const char *str, uint32_t *val) -{ - long long int lld; - char *endptr = NULL; - *val = 0; - errno = 0; - lld = strtoll(str, &endptr, 10); - if (errno || !endptr || *endptr) - return -EINVAL; - if (lld < 0 || lld > UINT32_MAX) - return -EINVAL; - *val = lld; - return 0; -} - -static int decode_port(const char *str, uint16_t *port) -{ - uint32_t val; - if (decode_uint32_t(str, &val)) - return -EINVAL; - if (val > 65535) - return -EINVAL; - *port = val; - return 0; -} - -/*! Read expected mDNS records into mslookup result. - * - * The records in the packet must be ordered as follows: - * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or - * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). - * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. - * - * \param[out] result holds the age, IPs and ports of the queried service. - * \param[in] ans abstracted mDNS answer with a list of resource records. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans) -{ - struct osmo_mdns_record *rec; - char txt_key[64]; - char txt_value[64]; - bool found_age = false; - bool found_ip_v4 = false; - bool found_ip_v6 = false; - struct osmo_sockaddr_str *expect_port_for = NULL; - - *result = (struct osmo_mslookup_result){}; - - result->rc = OSMO_MSLOOKUP_RC_NONE; - - llist_for_each_entry(rec, &ans->records, list) { - switch (rec->type) { - case OSMO_MDNS_RFC_RECORD_TYPE_A: - if (expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'A' record found, but still expecting a 'port' value first\n"); - return -EINVAL; - } - if (found_ip_v4) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n"); - return -EINVAL; - } - found_ip_v4 = true; - expect_port_for = &result->host_v4; - if (sockaddr_str_from_mdns_record(expect_port_for, rec)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n"); - return -EINVAL; - } - break; - case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: - if (expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'AAAA' record found, but still expecting a 'port' value first\n"); - return -EINVAL; - } - if (found_ip_v6) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n"); - return -EINVAL; - } - found_ip_v6 = true; - expect_port_for = &result->host_v6; - if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n"); - return -EINVAL; - } - break; - case OSMO_MDNS_RFC_RECORD_TYPE_TXT: - if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key), - txt_value, sizeof(txt_value)) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n"); - return -EINVAL; - } - if (strcmp(txt_key, "age") == 0) { - if (found_age) { - LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n"); - return -EINVAL; - } - found_age = true; - if (decode_uint32_t(txt_value, &result->age)) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value); - return -EINVAL; - } - } else if (strcmp(txt_key, "port") == 0) { - if (!expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n"); - return -EINVAL; - } - if (decode_port(txt_value, &expect_port_for->port)) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value); - return -EINVAL; - } - expect_port_for = NULL; - } else { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key); - return -EINVAL; - } - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); - return -EINVAL; - } - } - - /* Check if everything was found */ - if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n"); - return -EINVAL; - } - - result->rc = OSMO_MSLOOKUP_RC_RESULT; - return 0; -} - -/*! Decode a mDNS answer packet into a mslookup result, query and packet_id. - * \param[out] packet_id same ID as sent in the request packet. - * \param[out] query the original query (service, ID, ID type). - * \param[out] result holds the age, IPs and ports of the queried service. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, - struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, - const char *domain_suffix) -{ - int rc = -EINVAL; - struct osmo_mdns_msg_answer *ans; - ans = osmo_mdns_msg_answer_decode(ctx, data, data_len); - if (!ans) - goto exit_free; - - if (query_from_domain(query, ans->domain, domain_suffix) < 0) - goto exit_free; - - if (osmo_mdns_result_from_answer(result, ans) < 0) - goto exit_free; - - *packet_id = ans->id; - rc = 0; - -exit_free: - talloc_free(ans); - return rc; -} diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c deleted file mode 100644 index da65fef..0000000 --- a/src/mslookup/mdns_msg.c +++ /dev/null @@ -1,261 +0,0 @@ -/* High level mDNS encoding and decoding functions for whole messages: - * Request message (header, question) - * Answer message (header, resource record 1, ... resource record N)*/ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include - -/*! Encode request message into one mDNS packet, consisting of the header section and one question section. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req) -{ - struct osmo_mdns_rfc_header hdr = {0}; - struct osmo_mdns_rfc_question qst = {0}; - - hdr.id = req->id; - hdr.qdcount = 1; - osmo_mdns_rfc_header_encode(msg, &hdr); - - qst.domain = req->domain; - qst.qtype = req->type; - qst.qclass = OSMO_MDNS_RFC_CLASS_IN; - if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) - return -EINVAL; - - return 0; -} - -/*! Decode request message from a mDNS packet, consisting of the header section and one question section. - * \returns allocated request message on success, NULL on error. - */ -struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_header hdr = {0}; - size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); - struct osmo_mdns_rfc_question* qst = NULL; - struct osmo_mdns_msg_request *ret = NULL; - - if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0) - return NULL; - - qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len); - if (!qst) - return NULL; - - ret = talloc_zero(ctx, struct osmo_mdns_msg_request); - ret->id = hdr.id; - ret->domain = talloc_strdup(ret, qst->domain); - ret->type = qst->qtype; - - talloc_free(qst); - return ret; -} - -/*! Initialize the linked list for resource records in a answer message. */ -void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans) -{ - *ans = (struct osmo_mdns_msg_answer){}; - INIT_LLIST_HEAD(&ans->records); -} - -/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records. - * - * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of - * "message compression", which would send a question section with the domain before the resource records, and then - * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4). - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans) -{ - struct osmo_mdns_rfc_header hdr = {0}; - struct osmo_mdns_record *ans_record; - - hdr.id = ans->id; - hdr.qr = 1; - hdr.ancount = llist_count(&ans->records); - osmo_mdns_rfc_header_encode(msg, &hdr); - - llist_for_each_entry(ans_record, &ans->records, list) { - struct osmo_mdns_rfc_record rec = {0}; - - rec.domain = ans->domain; - rec.type = ans_record->type; - rec.class = OSMO_MDNS_RFC_CLASS_IN; - rec.ttl = 0; - rec.rdlength = ans_record->length; - rec.rdata = ans_record->data; - - if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) - return -EINVAL; - } - - return 0; -} - -/*! Decode answer message from a mDNS packet. - * - * Answer messages must consist of one header and one or more resource records. An additional question section or - * message compression (RFC 1035 4.1.4) are not supported. -* \returns allocated answer message on success, NULL on error. - */ -struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_header hdr = {}; - size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); - struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer); - - /* Parse header section */ - if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1) - goto error; - ret->id = hdr.id; - data_len -= hdr_len; - data += hdr_len; - - /* Parse resource records */ - INIT_LLIST_HEAD(&ret->records); - while (data_len) { - size_t record_len; - struct osmo_mdns_rfc_record *rec; - struct osmo_mdns_record* ret_record; - - rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len); - if (!rec) - goto error; - - /* Copy domain to ret */ - if (ret->domain) { - if (strcmp(ret->domain, rec->domain) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n", - ret->domain, rec->domain); - goto error; - } - } - else - ret->domain = talloc_strdup(ret, rec->domain); - - /* Add simplified record to ret */ - ret_record = talloc_zero(ret, struct osmo_mdns_record); - ret_record->type = rec->type; - ret_record->length = rec->rdlength; - ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength); - llist_add_tail(&ret_record->list, &ret->records); - - data += record_len; - data_len -= record_len; - talloc_free(rec); - } - - /* Verify record count */ - if (llist_count(&ret->records) != hdr.ancount) { - LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n", - llist_count(&ret->records), hdr.ancount); - goto error; - } - - return ret; -error: - talloc_free(ret); - return NULL; -} - -/*! Get a TXT resource record, which stores a key=value string. - * \returns allocated resource record on success, NULL on error. - */ -static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value) -{ - struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record); - size_t len = strlen(key) + 1 + strlen(value); - - if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1) - return NULL; - - /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */ - ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value); - if (!ret->data) - return NULL; - ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT; - ret->length = len + 1; - return ret; -} - -/*! Get a TXT resource record, which stores a key=value string, but build value from a format string. - * \returns allocated resource record on success, NULL on error. - */ -struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...) -{ - va_list ap; - char *value = NULL; - struct osmo_mdns_record *r; - - if (!value_fmt) - return _osmo_mdns_record_txt_encode(ctx, key, ""); - - va_start(ap, value_fmt); - value = talloc_vasprintf(ctx, value_fmt, ap); - if (!value) - return NULL; - va_end(ap); - r = _osmo_mdns_record_txt_encode(ctx, key, value); - talloc_free(value); - return r; -} - -/*! Decode a TXT resource record, which stores a key=value string. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, - char *key_buf, size_t key_size, char *value_buf, size_t value_size) -{ - const char *key_value; - const char *key_value_end; - const char *sep; - const char *value; - - if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT) - return -EINVAL; - - key_value = (const char *)rec->data; - key_value_end = key_value + rec->length; - - /* Verify and then skip the redundant string length byte */ - if (*key_value != rec->length - 1) - return -EINVAL; - key_value++; - - if (key_value >= key_value_end) - return -EINVAL; - - /* Find equals sign */ - sep = osmo_strnchr(key_value, key_value_end - key_value, '='); - if (!sep) - return -EINVAL; - - /* Parse key */ - osmo_print_n(key_buf, key_size, key_value, sep - key_value); - - /* Parse value */ - value = sep + 1; - osmo_print_n(value_buf, value_size, value, key_value_end - value); - return 0; -} diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c deleted file mode 100644 index e1fc184..0000000 --- a/src/mslookup/mdns_rfc.c +++ /dev/null @@ -1,265 +0,0 @@ -/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records, - * as described in these RFCs: - * - RFC 1035 (Domain names - implementation and specification) - * - RFC 3596 (DNS Extensions to Support IP Version 6) */ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include - -/* - * Encode/decode IEs - */ - -/*! Encode a domain string as qname (RFC 1035 4.1.2). - * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". - * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. - */ -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) -{ - char *domain_dup; - char *domain_iter; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ - struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; - char *label; - - if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - domain_iter = domain_dup = talloc_strdup(ctx, domain); - while ((label = strsep(&domain_iter, "."))) { - size_t len = strlen(label); - - /* Empty domain, dot at start, two dots in a row, or ending with a dot */ - if (!len) - goto error; - - OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); - } - - talloc_free(domain_dup); - return talloc_strdup(ctx, buf); - -error: - talloc_free(domain_dup); - return NULL; -} - -/*! Decode a domain string from a qname (RFC 1035 4.1.2). - * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) - * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. - * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), - * NULL on error. - */ -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) -{ - const char *next_label, *qname_end = qname + qname_max_len; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; - int i = 0; - - if (qname_max_len < 1) - return NULL; - - while (*qname) { - size_t len = *qname; - next_label = qname + len + 1; - - if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - if (i) { - /* Two dots in a row is not allowed */ - if (buf[i - 1] == '.') - return NULL; - - buf[i] = '.'; - i++; - } - - memcpy(buf + i, qname + 1, len); - i += len; - qname = next_label; - } - buf[i] = '\0'; - - return talloc_strdup(ctx, buf); -} - -/* - * Encode/decode message sections - */ - -/*! Encode header section (RFC 1035 4.1.1). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr) -{ - struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr)); - memcpy(buf, hdr, sizeof(*hdr)); - - osmo_store16be(buf->id, &buf->id); - osmo_store16be(buf->qdcount, &buf->qdcount); - osmo_store16be(buf->ancount, &buf->ancount); - osmo_store16be(buf->nscount, &buf->nscount); - osmo_store16be(buf->arcount, &buf->arcount); -} - -/*! Decode header section (RFC 1035 4.1.1). */ -int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr) -{ - if (data_len != sizeof(*hdr)) - return -EINVAL; - - memcpy(hdr, data, data_len); - - hdr->id = osmo_load16be(&hdr->id); - hdr->qdcount = osmo_load16be(&hdr->qdcount); - hdr->ancount = osmo_load16be(&hdr->ancount); - hdr->nscount = osmo_load16be(&hdr->nscount); - hdr->arcount = osmo_load16be(&hdr->arcount); - - return 0; -} - -/*! Encode question section (RFC 1035 4.1.2). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) -{ - char *qname; - size_t qname_len; - uint8_t *qname_buf; - - /* qname */ - qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); - if (!qname) - return -EINVAL; - qname_len = strlen(qname) + 1; - qname_buf = msgb_put(msg, qname_len); - memcpy(qname_buf, qname, qname_len); - talloc_free(qname); - - /* qtype and qclass */ - msgb_put_u16(msg, qst->qtype); - msgb_put_u16(msg, qst->qclass); - - return 0; -} - -/*! Decode question section (RFC 1035 4.1.2). */ -struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_question *ret; - size_t qname_len = data_len - 4; - - if (data_len < 6) - return NULL; - - /* qname */ - ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); - if (!ret) - return NULL; - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); - if (!ret->domain) { - talloc_free(ret); - return NULL; - } - - /* qtype and qclass */ - ret->qtype = osmo_load16be(data + qname_len); - ret->qclass = osmo_load16be(data + qname_len + 2); - - return ret; -} - -/* - * Encode/decode resource records - */ - -/*! Encode one resource record (RFC 1035 4.1.3). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) -{ - char *name; - size_t name_len; - uint8_t *buf; - - /* name */ - name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); - if (!name) - return -EINVAL; - name_len = strlen(name) + 1; - buf = msgb_put(msg, name_len); - memcpy(buf, name, name_len); - talloc_free(name); - - /* type, class, ttl, rdlength */ - msgb_put_u16(msg, rec->type); - msgb_put_u16(msg, rec->class); - msgb_put_u32(msg, rec->ttl); - msgb_put_u16(msg, rec->rdlength); - - /* rdata */ - buf = msgb_put(msg, rec->rdlength); - memcpy(buf, rec->rdata, rec->rdlength); - return 0; -} - -/*! Decode one resource record (RFC 1035 4.1.3). */ -struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, - size_t *record_len) -{ - struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); - size_t name_len; - - /* name */ - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); - if (!ret->domain) - goto error; - name_len = strlen(ret->domain) + 2; - if (name_len + 10 > data_len) - goto error; - - /* type, class, ttl, rdlength */ - ret->type = osmo_load16be(data + name_len); - ret->class = osmo_load16be(data + name_len + 2); - ret->ttl = osmo_load32be(data + name_len + 4); - ret->rdlength = osmo_load16be(data + name_len + 8); - if (name_len + 10 + ret->rdlength > data_len) - goto error; - - /* rdata */ - ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength); - if (!ret->rdata) - return NULL; - - *record_len = name_len + 10 + ret->rdlength; - return ret; -error: - talloc_free(ret); - return NULL; -} - diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c deleted file mode 100644 index 5291660..0000000 --- a/src/mslookup/mdns_sock.c +++ /dev/null @@ -1,144 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/*! Open socket to send and receive multicast data. - * - * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives - * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever - * sending something, the receive callback will be called with the same data and should discard it. - * - * \param[in] ip multicast IPv4 or IPv6 address. - * \param[in] port port number. - * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd). - * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data). - * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr). - * \returns allocated osmo_mdns_sock, NULL on error. - */ -struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, - int (*cb)(struct osmo_fd *fd, unsigned int what), - void *data, unsigned int priv_nr) -{ - struct osmo_mdns_sock *ret; - int sock, rc; - struct addrinfo hints = {0}; - struct ip_mreq multicast_req = {0}; - in_addr_t iface = INADDR_ANY; - char portbuf[10]; - int y = 1; - - snprintf(portbuf, sizeof(portbuf) -1, "%u", port); - ret = talloc_zero(ctx, struct osmo_mdns_sock); - OSMO_ASSERT(ret); - - /* Fill addrinfo */ - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); - rc = getaddrinfo(ip, portbuf, &hints, &ret->ai); - if (rc != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc)); - ret->ai = NULL; - goto error; - } - - /* Open socket */ - sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0); - if (sock == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno)); - goto error; - } - - /* Set multicast options */ - rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, - sizeof(multicast_req.imr_multiaddr)); - multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); - rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - - /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by - * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for - * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same - * time need to be resolved with the simple dialplan example that just starts new processes). */ - rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - - /* Bind and register osmo_fd callback */ - rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); - goto error; - } - osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); - if (osmo_fd_register(&ret->osmo_fd) != 0) - goto error; - - return ret; -error: - if (ret->ai) - freeaddrinfo(ret->ai); - talloc_free(ret); - return NULL; -} - -/*! Send msgb over mdns_sock and consume msgb. - * \returns 0 on success, -1 on error. - */ -int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) -{ - size_t len = msgb_length(msg); - int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr, - mdns_sock->ai->ai_addrlen); - msgb_free(msg); - return (rc == len) ? 0 : -1; -} - -/*! Tear down osmo_mdns_sock. */ -void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock) -{ - osmo_fd_close(&mdns_sock->osmo_fd); - freeaddrinfo(mdns_sock->ai); - talloc_free(mdns_sock); -} diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c deleted file mode 100644 index 7ba3502..0000000 --- a/src/mslookup/mslookup_client_mdns.c +++ /dev/null @@ -1,235 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct osmo_mdns_method_state { - /* Parameters passed by _add_method_dns() */ - struct osmo_sockaddr_str bind_addr; - const char *domain_suffix; - - struct osmo_mdns_sock *mc; - - struct osmo_mslookup_client *client; - struct llist_head requests; - uint16_t next_packet_id; -}; - -struct osmo_mdns_method_request { - struct llist_head entry; - uint32_t request_handle; - struct osmo_mslookup_query query; - uint16_t packet_id; -}; - -static int request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state, - struct osmo_mslookup_query *query, uint16_t packet_id) -{ - struct osmo_mdns_method_request *request; - - llist_for_each_entry(request, &state->requests, entry) { - if (strcmp(request->query.service, query->service) != 0) - continue; - if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0) - continue; - - /* Match! */ - *request_handle = request->request_handle; - return 0; - } - return -1; -} - -static int mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what) -{ - struct osmo_mdns_method_state *state = osmo_fd->data; - struct osmo_mslookup_result result; - struct osmo_mslookup_query query; - uint16_t packet_id; - int n; - uint8_t buffer[1024]; - uint32_t request_handle = 0; - void *ctx = state; - - n = read(osmo_fd->fd, buffer, sizeof(buffer)); - if (n < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n"); - return n; - } - - if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0) - return -EINVAL; - - if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0) - return -EINVAL; - - osmo_mslookup_client_rx_result(state->client, request_handle, &result); - return n; -} - -static void mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query, - uint32_t request_handle) -{ - char buf[256]; - struct osmo_mdns_method_state *state = method->priv; - struct msgb *msg; - struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request); - - *r = (struct osmo_mdns_method_request){ - .request_handle = request_handle, - .query = *query, - .packet_id = state->next_packet_id, - }; - llist_add(&r->entry, &state->requests); - state->next_packet_id++; - - msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix); - if (!msg) { - LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); - } - - /* Send over the wire */ - LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service, - osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id)); - if (osmo_mdns_sock_send(state->mc, msg) == -1) - LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\n"); -} - -static void mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle) -{ - struct osmo_mdns_method_state *state = method->priv; - - /* Tear down any state associated with this handle. */ - struct osmo_mdns_method_request *r; - llist_for_each_entry(r, &state->requests, entry) { - if (r->request_handle != request_handle) - continue; - llist_del(&r->entry); - talloc_free(r); - return; - } -} - -static void mdns_method_destruct(struct osmo_mslookup_client_method *method) -{ - struct osmo_mdns_method_state *state = method->priv; - struct osmo_mdns_method_request *e, *n; - if (!state) - return; - - /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will - * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */ - llist_for_each_entry_safe(e, n, &state->requests, entry) { - llist_del(&e->entry); - } - - osmo_mdns_sock_cleanup(state->mc); -} - -/*! Initialize the mDNS lookup method. - * \param[in] client the client to attach the method to. - * \param[in] ip IPv4 or IPv6 address string. - * \param[in] port The port to bind to. - * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All - * servers answer to each query with the same packet ID. Set to -1 to use a random - * initial ID (recommended unless you need deterministic output). This ID is for visually - * distinguishing the packets in packet sniffers, the mslookup client uses not just the - * ID, but all query parameters (service type, ID, ID type), to determine if a reply is - * relevant. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" */ -struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, - uint16_t port, int initial_packet_id, - const char *domain_suffix) -{ - struct osmo_mdns_method_state *state; - struct osmo_mslookup_client_method *m; - - m = talloc_zero(client, struct osmo_mslookup_client_method); - OSMO_ASSERT(m); - - state = talloc_zero(m, struct osmo_mdns_method_state); - OSMO_ASSERT(state); - INIT_LLIST_HEAD(&state->requests); - if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n", - ip, port); - goto error_cleanup; - } - - if (initial_packet_id == -1) { - if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n"); - goto error_cleanup; - } - } else - state->next_packet_id = initial_packet_id; - - state->client = client; - state->domain_suffix = domain_suffix; - - state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0); - if (!state->mc) - goto error_cleanup; - - *m = (struct osmo_mslookup_client_method){ - .name = "mDNS", - .priv = state, - .request = mdns_method_request, - .request_cleanup = mdns_method_request_cleanup, - .destruct = mdns_method_destruct, - }; - - osmo_mslookup_client_method_add(client, m); - return m; - -error_cleanup: - talloc_free(m); - return NULL; -} - -const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method) -{ - struct osmo_mdns_method_state *state; - if (!dns_method || !dns_method->priv) - return NULL; - state = dns_method->priv; - return &state->bind_addr; -} - -const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method) -{ - struct osmo_mdns_method_state *state; - if (!dns_method || !dns_method->priv) - return NULL; - state = dns_method->priv; - return state->domain_suffix; -} diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index ebf2add..71602a3 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -16,15 +16,11 @@ $(NULL) EXTRA_DIST = \ - mdns_test.err \ - mslookup_client_mdns_test.err \ mslookup_client_test.err \ mslookup_test.err \ $(NULL) check_PROGRAMS = \ - mdns_test \ - mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -45,22 +41,6 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -mslookup_client_mdns_test_SOURCES = \ - mslookup_client_mdns_test.c \ - $(NULL) -mslookup_client_mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -mdns_test_SOURCES = \ - mdns_test.c \ - $(NULL) -mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c deleted file mode 100644 index 8a60e85..0000000 --- a/tests/mslookup/mdns_test.c +++ /dev/null @@ -1,602 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -struct qname_enc_dec_test { - const char *domain; - const char *qname; - size_t qname_max_len; /* default: strlen(qname) + 1 */ -}; - -static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { - { - /* OK: typical mslookup domain */ - .domain = "hlr.1234567.imsi", - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: double dot */ - .domain = "hlr..imsi", - .qname = NULL, - }, - { - /* Wrong format: double dot */ - .domain = "hlr", - .qname = "\x03hlr\0\x03imsi", - }, - { - /* Wrong format: dot at end */ - .domain = "hlr.", - .qname = NULL, - }, - { - /* Wrong format: dot at start */ - .domain = ".hlr", - .qname = NULL, - }, - { - /* Wrong format: empty */ - .domain = "", - .qname = NULL, - }, - { - /* OK: maximum length */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345" - , - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\x05" "12345" - }, - { - /* Error: too long domain */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345toolong" - , - .qname = NULL, - }, - { - /* Error: too long qname */ - .domain = NULL, - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: token length at end of qname */ - .domain = NULL, - .qname = "\x03hlr\x03", - }, - { - /* Error: overflow in label length */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - .qname_max_len = 17, - }, -}; - -void test_enc_dec_rfc_qname(void *ctx) -{ - char quote_buf[300]; - int i; - - fprintf(stderr, "-- %s --\n", __func__); - - for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { - const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; - char *res; - - if (t->domain) { - fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - res = osmo_mdns_rfc_qname_encode(ctx, t->domain); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - - if (t->qname) { - size_t qname_max_len = t->qname_max_len; - if (qname_max_len) - fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); - else - qname_max_len = strlen(t->qname) + 1; - - fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - } -} - -#define PRINT_HDR(hdr, name) \ - fprintf(stderr, "header %s:\n" \ - ".id = %i\n" \ - ".qr = %i\n" \ - ".opcode = %x\n" \ - ".aa = %i\n" \ - ".tc = %i\n" \ - ".rd = %i\n" \ - ".ra = %i\n" \ - ".z = %x\n" \ - ".rcode = %x\n" \ - ".qdcount = %u\n" \ - ".ancount = %u\n" \ - ".nscount = %u\n" \ - ".arcount = %u\n", \ - name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \ - hdr.ancount, hdr.nscount, hdr.arcount) - -static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = { - { - /* Typical use case for mslookup */ - .id = 1337, - .qdcount = 1, - }, - { - /* Fill out everything */ - .id = 42, - .qr = 1, - .opcode = 0x02, - .aa = 1, - .tc = 1, - .rd = 1, - .ra = 1, - .z = 0x02, - .rcode = 0x03, - .qdcount = 1234, - .ancount = 1111, - .nscount = 2222, - .arcount = 3333, - }, -}; - -void test_enc_dec_rfc_header() -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i]; - struct osmo_mdns_rfc_header out = {0}; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - - PRINT_HDR(in, "in"); - osmo_mdns_rfc_header_encode(msg, &in); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0); - PRINT_HDR(out, "out"); - - fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in))); - fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out))); - assert(memcmp(&in, &out, sizeof(in)) == 0); - - fprintf(stderr, "=> OK\n\n"); - msgb_free(msg); - } -} - -void test_enc_dec_rfc_header_einval() -{ - struct osmo_mdns_rfc_header out = {0}; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - fprintf(stderr, "-- %s --\n", __func__); - - assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL); - fprintf(stderr, "=> OK\n\n"); - - msgb_free(msg); -} - -#define PRINT_QST(qst, name) \ - fprintf(stderr, "question %s:\n" \ - ".domain = %s\n" \ - ".qtype = %i\n" \ - ".qclass = %i\n", \ - name, (qst)->domain, (qst)->qtype, (qst)->qclass) - -static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = { - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL, - .qclass = OSMO_MDNS_RFC_CLASS_IN, - }, - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A, - .qclass = OSMO_MDNS_RFC_CLASS_ALL, - }, - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA, - .qclass = OSMO_MDNS_RFC_CLASS_ALL, - }, -}; - -void test_enc_dec_rfc_question(void *ctx) -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i]; - struct osmo_mdns_rfc_question *out; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - - PRINT_QST(&in, "in"); - assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); - assert(out); - PRINT_QST(out, "out"); - - if (strcmp(in.domain, out->domain) != 0) - fprintf(stderr, "=> ERROR: domain does not match\n"); - else if (in.qtype != out->qtype) - fprintf(stderr, "=> ERROR: qtype does not match\n"); - else if (in.qclass != out->qclass) - fprintf(stderr, "=> ERROR: qclass does not match\n"); - else - fprintf(stderr, "=> OK\n"); - - fprintf(stderr, "\n"); - msgb_free(msg); - talloc_free(out); - } -} - -void test_enc_dec_rfc_question_null(void *ctx) -{ - uint8_t data[5] = {0}; - - fprintf(stderr, "-- %s --\n", __func__); - assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL); - fprintf(stderr, "=> OK\n\n"); -} - -#define PRINT_REC(rec, name) \ - fprintf(stderr, "question %s:\n" \ - ".domain = %s\n" \ - ".type = %i\n" \ - ".class = %i\n" \ - ".ttl = %i\n" \ - ".rdlength = %i\n" \ - ".rdata = %s\n", \ - name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \ - osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength)) - -static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = { - { - .domain = "hlr.1234567.imsi", - .type = OSMO_MDNS_RFC_RECORD_TYPE_A, - .class = OSMO_MDNS_RFC_CLASS_IN, - .ttl = 1234, - .rdlength = 9, - .rdata = (uint8_t *)"10.42.2.1", - }, -}; - -void test_enc_dec_rfc_record(void *ctx) -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i]; - struct osmo_mdns_rfc_record *out; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - size_t record_len; - - PRINT_REC(&in, "in"); - assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); - fprintf(stderr, "record_len: %lu\n", record_len); - assert(out); - PRINT_REC(out, "out"); - - if (strcmp(in.domain, out->domain) != 0) - fprintf(stderr, "=> ERROR: domain does not match\n"); - else if (in.type != out->type) - fprintf(stderr, "=> ERROR: type does not match\n"); - else if (in.class != out->class) - fprintf(stderr, "=> ERROR: class does not match\n"); - else if (in.ttl != out->ttl) - fprintf(stderr, "=> ERROR: ttl does not match\n"); - else if (in.rdlength != out->rdlength) - fprintf(stderr, "=> ERROR: rdlength does not match\n"); - else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0) - fprintf(stderr, "=> ERROR: rdata does not match\n"); - else - fprintf(stderr, "=> OK\n"); - - fprintf(stderr, "\n"); - msgb_free(msg); - talloc_free(out); - } -} - -static uint8_t ip_v4_n[] = {23, 42, 47, 11}; -static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, - 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}; - - -enum test_records { - RECORD_NONE, - RECORD_A, - RECORD_AAAA, - RECORD_TXT_AGE, - RECORD_TXT_PORT_444, - RECORD_TXT_PORT_666, - RECORD_TXT_INVALID_KEY, - RECORD_TXT_INVALID_NO_KEY_VALUE, - RECORD_INVALID, -}; -struct result_from_answer_test { - const char *desc; - const enum test_records records[5]; - bool error; - const struct osmo_mslookup_result res; -}; - -static void test_result_from_answer(void *ctx) -{ - void *print_ctx = talloc_named_const(ctx, 0, __func__); - struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"}; - struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666, - .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"}; - struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v4 = test_host_v4}; - struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v6 = test_host_v6}; - struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v4 = test_host_v4, .host_v6 = test_host_v6}; - struct result_from_answer_test result_from_answer_data[] = { - { - .desc = "IPv4", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444}, - .res = test_result_v4 - }, - { - .desc = "IPv6", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666}, - .res = test_result_v6 - }, - { - .desc = "IPv4 + IPv6", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666}, - .res = test_result_v4_v6 - }, - { - .desc = "A twice", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A}, - .error = true - }, - { - .desc = "AAAA twice", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA}, - .error = true - }, - { - .desc = "invalid TXT: no key/value pair", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE}, - .error = true - }, - { - .desc = "age twice", - .records = {RECORD_TXT_AGE, RECORD_TXT_AGE}, - .error = true - }, - { - .desc = "port as first record", - .records = {RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "port without previous ip record", - .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "invalid TXT: invalid key", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY}, - .error = true - }, - { - .desc = "unexpected record type", - .records = {RECORD_TXT_AGE, RECORD_INVALID}, - .error = true - }, - { - .desc = "missing record: age", - .records = {RECORD_A, RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "missing record: port for ipv4", - .records = {RECORD_TXT_AGE, RECORD_A}, - .error = true - }, - { - .desc = "missing record: port for ipv4 #2", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A}, - .error = true - }, - }; - int i = 0; - int j = 0; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) { - struct result_from_answer_test *t = &result_from_answer_data[i]; - struct osmo_mdns_msg_answer ans = {0}; - struct osmo_mslookup_result res = {0}; - void *ctx_test = talloc_named_const(ctx, 0, t->desc); - bool is_error; - - fprintf(stderr, "---\n"); - fprintf(stderr, "test: %s\n", t->desc); - fprintf(stderr, "error: %s\n", t->error ? "true" : "false"); - fprintf(stderr, "records:\n"); - /* Build records list */ - INIT_LLIST_HEAD(&ans.records); - for (j = 0; j < ARRAY_SIZE(t->records); j++) { - struct osmo_mdns_record *rec = NULL; - - switch (t->records[j]) { - case RECORD_NONE: - break; - case RECORD_A: - fprintf(stderr, "- A 42.42.42.42\n"); - rec = talloc_zero(ctx_test, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A; - rec->data = ip_v4_n; - rec->length = sizeof(ip_v4_n); - break; - case RECORD_AAAA: - fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n"); - rec = talloc_zero(ctx_test, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; - rec->data = ip_v6_n; - rec->length = sizeof(ip_v6_n); - break; - case RECORD_TXT_AGE: - fprintf(stderr, "- TXT age=3\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3"); - break; - case RECORD_TXT_PORT_444: - fprintf(stderr, "- TXT port=444\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444"); - break; - case RECORD_TXT_PORT_666: - fprintf(stderr, "- TXT port=666\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666"); - break; - case RECORD_TXT_INVALID_KEY: - fprintf(stderr, "- TXT hello=world\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world"); - break; - case RECORD_TXT_INVALID_NO_KEY_VALUE: - fprintf(stderr, "- TXT 12345\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45"); - rec->data[3] = '3'; - break; - case RECORD_INVALID: - fprintf(stderr, "- (invalid)\n"); - rec = talloc_zero(ctx, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN; - break; - } - - if (rec) - llist_add_tail(&rec->list, &ans.records); - } - - /* Verify output */ - is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0); - if (t->error != is_error) { - fprintf(stderr, "got %s\n", is_error ? "error" : "no error"); - OSMO_ASSERT(false); - } - if (!t->error) { - fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res)); - fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res)); - OSMO_ASSERT(t->res.rc == res.rc); - OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4)); - OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6)); - OSMO_ASSERT(t->res.age == res.age); - OSMO_ASSERT(t->res.last == res.last); - } - - talloc_free(ctx_test); - fprintf(stderr, "=> OK\n"); - } -} - -int main() -{ - void *ctx = talloc_named_const(NULL, 0, "main"); - osmo_init_logging2(ctx, NULL); - - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_level(osmo_stderr_target, 1); - log_set_print_category(osmo_stderr_target, 1); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_use_color(osmo_stderr_target, 0); - - test_enc_dec_rfc_qname(ctx); - test_enc_dec_rfc_header(); - test_enc_dec_rfc_header_einval(); - test_enc_dec_rfc_question(ctx); - test_enc_dec_rfc_question_null(ctx); - test_enc_dec_rfc_record(ctx); - - test_result_from_answer(ctx); - - return 0; -} diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err deleted file mode 100644 index 51e5afe..0000000 --- a/tests/mslookup/mdns_test.err +++ /dev/null @@ -1,336 +0,0 @@ --- test_enc_dec_rfc_qname -- -domain: "hlr.1234567.imsi" -exp: "\3hlr\a1234567\4imsi" -res: "\3hlr\a1234567\4imsi" -=> OK - -qname: "\3hlr\a1234567\4imsi" -exp: "hlr.1234567.imsi" -res: "hlr.1234567.imsi" -=> OK - -domain: "hlr..imsi" -exp: NULL -res: NULL -=> OK - -domain: "hlr" -exp: "\3hlr" -res: "\3hlr" -=> OK - -qname: "\3hlr" -exp: "hlr" -res: "hlr" -=> OK - -domain: "hlr." -exp: NULL -res: NULL -=> OK - -domain: ".hlr" -exp: NULL -res: NULL -=> OK - -domain: "" -exp: NULL -res: NULL -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" -exp: NULL -res: NULL -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\a1234567\5imsi" -exp: NULL -res: NULL -=> OK - -qname: "\2hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\3" -exp: NULL -res: NULL -=> OK - -qname_max_len: 17 -qname: "\3hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - --- test_enc_dec_rfc_header -- -header in: -.id = 1337 -.qr = 0 -.opcode = 0 -.aa = 0 -.tc = 0 -.rd = 0 -.ra = 0 -.z = 0 -.rcode = 0 -.qdcount = 1 -.ancount = 0 -.nscount = 0 -.arcount = 0 -encoded: 05 39 00 00 00 01 00 00 00 00 00 00 -header out: -.id = 1337 -.qr = 0 -.opcode = 0 -.aa = 0 -.tc = 0 -.rd = 0 -.ra = 0 -.z = 0 -.rcode = 0 -.qdcount = 1 -.ancount = 0 -.nscount = 0 -.arcount = 0 -in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 -out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 -=> OK - -header in: -.id = 42 -.qr = 1 -.opcode = 2 -.aa = 1 -.tc = 1 -.rd = 1 -.ra = 1 -.z = 2 -.rcode = 3 -.qdcount = 1234 -.ancount = 1111 -.nscount = 2222 -.arcount = 3333 -encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 -header out: -.id = 42 -.qr = 1 -.opcode = 2 -.aa = 1 -.tc = 1 -.rd = 1 -.ra = 1 -.z = 2 -.rcode = 3 -.qdcount = 1234 -.ancount = 1111 -.nscount = 2222 -.arcount = 3333 -in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d -out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d -=> OK - --- test_enc_dec_rfc_header_einval -- -=> OK - --- test_enc_dec_rfc_question -- -question in: -.domain = hlr.1234567.imsi -.qtype = 255 -.qclass = 1 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 -question out: -.domain = hlr.1234567.imsi -.qtype = 255 -.qclass = 1 -=> OK - -question in: -.domain = hlr.1234567.imsi -.qtype = 1 -.qclass = 255 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff -question out: -.domain = hlr.1234567.imsi -.qtype = 1 -.qclass = 255 -=> OK - -question in: -.domain = hlr.1234567.imsi -.qtype = 28 -.qclass = 255 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff -question out: -.domain = hlr.1234567.imsi -.qtype = 28 -.qclass = 255 -=> OK - --- test_enc_dec_rfc_question_null -- -=> OK - --- test_enc_dec_rfc_record -- -question in: -.domain = hlr.1234567.imsi -.type = 1 -.class = 1 -.ttl = 1234 -.rdlength = 9 -.rdata = "10.42.2.1" -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 -record_len: 37 -question out: -.domain = hlr.1234567.imsi -.type = 1 -.class = 1 -.ttl = 1234 -.rdlength = 9 -.rdata = "10.42.2.1" -=> OK - --- test_result_from_answer -- ---- -test: IPv4 -error: false -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last) -res: -> ipv4: 23.42.47.11:444 (age=3) (not-last) -=> OK ---- -test: IPv6 -error: false -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -=> OK ---- -test: IPv4 + IPv6 -error: false -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -=> OK ---- -test: A twice -error: true -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -- A 42.42.42.42 -DLGLOBAL ERROR 'A' record found twice in mDNS answer -=> OK ---- -test: AAAA twice -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=444 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer -=> OK ---- -test: invalid TXT: no key/value pair -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT 12345 -DLGLOBAL ERROR failed to decode txt record -=> OK ---- -test: age twice -error: true -records: -- TXT age=3 -- TXT age=3 -DLGLOBAL ERROR duplicate 'TXT' record for 'age' -=> OK ---- -test: port as first record -error: true -records: -- TXT port=444 -DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record -=> OK ---- -test: port without previous ip record -error: true -records: -- TXT age=3 -- TXT port=444 -DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record -=> OK ---- -test: invalid TXT: invalid key -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT hello=world -DLGLOBAL ERROR unexpected key 'hello' in TXT record -=> OK ---- -test: unexpected record type -error: true -records: -- TXT age=3 -- (invalid) -DLGLOBAL ERROR unexpected record type -=> OK ---- -test: missing record: age -error: true -records: -- A 42.42.42.42 -- TXT port=444 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK ---- -test: missing record: port for ipv4 -error: true -records: -- TXT age=3 -- A 42.42.42.42 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK ---- -test: missing record: port for ipv4 #2 -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -- A 42.42.42.42 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c deleted file mode 100644 index 6091e3c..0000000 --- a/tests/mslookup/mslookup_client_mdns_test.c +++ /dev/null @@ -1,220 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void *ctx = NULL; - -#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4 -#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT -#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org" - -/* - * Test server (emulates the mDNS server in OsmoHLR) and client - */ -struct osmo_mdns_sock *server_mc; - - -static void server_reply(struct osmo_mslookup_query *query, uint16_t packet_id) -{ - struct osmo_mslookup_result result = {0}; - struct msgb *msg; - - result.rc = OSMO_MSLOOKUP_RC_RESULT; - result.age = 3; - osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444); - osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666); - - msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX); - OSMO_ASSERT(msg); - OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 0); -} - -static int server_recv(struct osmo_fd *osmo_fd, unsigned int what) -{ - int n; - uint8_t buffer[1024]; - uint16_t packet_id; - struct osmo_mslookup_query *query; - - fprintf(stderr, "%s\n", __func__); - - /* Parse the message and print it */ - n = read(osmo_fd->fd, buffer, sizeof(buffer)); - OSMO_ASSERT(n >= 0); - - query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX); - if (!query) - return -1; /* server receiving own answer is expected */ - - fprintf(stderr, "received request\n"); - server_reply(query, packet_id); - talloc_free(query); - return n; -} - -static void server_init() -{ - fprintf(stderr, "%s\n", __func__); - server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0); - OSMO_ASSERT(server_mc); -} - -static void server_stop() -{ - fprintf(stderr, "%s\n", __func__); - OSMO_ASSERT(server_mc); - osmo_mdns_sock_cleanup(server_mc); - server_mc = NULL; -} - -struct osmo_mslookup_client* client; -struct osmo_mslookup_client_method* client_method; - -static void client_init() -{ - fprintf(stderr, "%s\n", __func__); - client = osmo_mslookup_client_new(ctx); - OSMO_ASSERT(client); - client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX); - OSMO_ASSERT(client_method); -} - -static void client_recv(struct osmo_mslookup_client *client, uint32_t request_handle, - const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result) -{ - char buf[256]; - fprintf(stderr, "%s\n", __func__); - fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - - osmo_mslookup_client_request_cancel(client, request_handle); -} - -static void client_query() -{ - struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI, - .imsi = "123456789012345"}; - const struct osmo_mslookup_query query = { - .service = "gsup.hlr", - .id = id, - }; - struct osmo_mslookup_query_handling handling = { - .result_timeout_milliseconds = 2000, - .result_cb = client_recv, - }; - - fprintf(stderr, "%s\n", __func__); - osmo_mslookup_client_request(client, &query, &handling); -} - -static void client_stop() -{ - fprintf(stderr, "%s\n", __func__); - osmo_mslookup_client_free(client); - client = NULL; -} -const struct timeval fake_time_start_time = { 0, 0 }; - -#define fake_time_passes(secs, usecs) do \ -{ \ - struct timeval diff; \ - osmo_gettimeofday_override_add(secs, usecs); \ - osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ - timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ - LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ - (int)diff.tv_sec, (int)diff.tv_usec); \ - osmo_timers_prepare(); \ - osmo_timers_update(); \ -} while (0) - -static void fake_time_start() -{ - struct timespec *clock_override; - - osmo_gettimeofday_override_time = fake_time_start_time; - osmo_gettimeofday_override = true; - clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); - OSMO_ASSERT(clock_override); - clock_override->tv_sec = fake_time_start_time.tv_sec; - clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; - osmo_clock_override_enable(CLOCK_MONOTONIC, true); - fake_time_passes(0, 0); -} -static void test_server_client() -{ - fprintf(stderr, "-- %s --\n", __func__); - server_init(); - client_init(); - client_query(); - - /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and - * port, the client will also receive its own question. The client will dismiss its own question, as it is just - * looking for answers. */ - OSMO_ASSERT(osmo_select_main_ctx(1) == 1); - - /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback - * (client_recv()) just yet, because it is waiting for the best result within two seconds. */ - OSMO_ASSERT(osmo_select_main_ctx(1) == 1); - - /* Time flies by, client_recv() gets called. */ - fake_time_passes(5, 0); - - server_stop(); - client_stop(); -} - -/* - * Run all tests - */ -int main() -{ - talloc_enable_null_tracking(); - ctx = talloc_named_const(NULL, 0, "main"); - osmo_init_logging2(ctx, NULL); - - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_level(osmo_stderr_target, 0); - log_set_print_category(osmo_stderr_target, 0); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_use_color(osmo_stderr_target, 0); - log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); - - fake_time_start(); - - test_server_client(); - - log_fini(); - - OSMO_ASSERT(talloc_total_blocks(ctx) == 1); - talloc_free(ctx); - OSMO_ASSERT(talloc_total_blocks(NULL) == 1); - talloc_disable_null_tracking(); - - return 0; -} diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err deleted file mode 100644 index b4ea269..0000000 --- a/tests/mslookup/mslookup_client_mdns_test.err +++ /dev/null @@ -1,14 +0,0 @@ -Total time passed: 0.000000 s --- test_server_client -- -server_init -client_init -client_query -sending mDNS query: gsup.hlr.123456789012345.imsi -server_recv -received request -server_recv -client_recv -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -Total time passed: 5.000000 s -server_stop -client_stop diff --git a/tests/testsuite.at b/tests/testsuite.at index 827e9f8..39df7aa 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -40,12 +40,6 @@ AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([mdns]) -AT_KEYWORDS([mdns]) -cat $abs_srcdir/mslookup/mdns_test.err > experr -AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr]) -AT_CLEANUP - AT_SETUP([mslookup]) AT_KEYWORDS([mslookup]) cat $abs_srcdir/mslookup/mslookup_test.err > experr @@ -57,9 +51,3 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP - -AT_SETUP([mslookup_client_mdns]) -AT_KEYWORDS([mslookup_client_mdns]) -cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr -AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) -AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d Gerrit-Change-Number: 16828 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:32:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:32:24 +0000 Subject: Change in osmo-bts[master]: rsl.c: Fix compiler error on gcc-9.2.1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16826 ) Change subject: rsl.c: Fix compiler error on gcc-9.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id982a814f401e304327d25c77666f039bc156c1f Gerrit-Change-Number: 16826 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 15:32:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:32:28 +0000 Subject: Change in osmo-bts[master]: rsl.c: Fix compiler error on gcc-9.2.1 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16826 ) Change subject: rsl.c: Fix compiler error on gcc-9.2.1 ...................................................................... rsl.c: Fix compiler error on gcc-9.2.1 rsl.c: In function ?rsl_rx_ipac_XXcx?: rsl.c:2147:39: error: ?%s? directive output may be truncated writing up to 255 bytes into a region of size 28 [-Werror=format-truncation=] 2147 | snprintf(cname, sizeof(cname), "bts@%s", ipstr); | ^~ rsl.c:2147:3: note: ?snprintf? output between 5 and 260 bytes into a destination of size 32 2147 | snprintf(cname, sizeof(cname), "bts@%s", ipstr); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Id982a814f401e304327d25c77666f039bc156c1f --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index d7e3565..10fb95e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2081,7 +2081,7 @@ } if (dch->c.msg_type == RSL_MT_IPAC_CRCX) { - char cname[32]; + char cname[256+4]; char *ipstr = NULL; if (lchan->abis_ip.rtp_socket) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Rx RSL IPAC CRCX, " -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id982a814f401e304327d25c77666f039bc156c1f Gerrit-Change-Number: 16826 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:32:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:32:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Switch back to upstream for more repositories In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 ) Change subject: deps/Makefile: Switch back to upstream for more repositories ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 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: I91a1e13173e059a94fb76858ec1a1879ab1a8686 Gerrit-Change-Number: 16815 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 15:32:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:32:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:32:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Switch back to upstream for more repositories In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 ) Change subject: deps/Makefile: Switch back to upstream for more repositories ...................................................................... deps/Makefile: Switch back to upstream for more repositories Upstream TITAN has merged some of our changes upstream, so we can move away from our forked repositories Change-Id: I91a1e13173e059a94fb76858ec1a1879ab1a8686 --- M deps/Makefile 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index d39cec2..ec60d45 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -24,6 +24,7 @@ titan.ProtocolModules.IP \ titan.ProtocolModules.JSON_v07_2006 \ titan.ProtocolModules.L2TP \ + titan.ProtocolModules.M3UA \ titan.ProtocolModules.SMPP \ titan.ProtocolModules.TCP \ titan.ProtocolModules.UDP \ @@ -53,16 +54,15 @@ titan.ProtocolModules.GTP_v13.5.0 \ titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ISUP_Q.762 \ + titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.NAS_EPS_15.2.0.1 \ titan.ProtocolModules.NS_v7.3.0 \ + titan.ProtocolModules.SGsAP_13.2.0 \ titan.ProtocolModules.SNDCP_v7.0.0 \ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ - titan.ProtocolModules.LLC_v7.1.0 \ - titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ - titan.ProtocolModules.M3UA \ titan.ProtocolEmulations.M3UA \ titan.ProtocolEmulations.SCCP @@ -90,10 +90,10 @@ titan.ProtocolModules.ISUP_Q.762_commit= R.8.A titan.ProtocolModules.JSON_v07_2006_commit= R.1.A titan.ProtocolModules.L2TP_commit= R.2.A -titan.ProtocolModules.LLC_v7.1.0_commit= 2a3c09fbf7bae22f802aa88689800f38a1f3732d +titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248d titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A -titan.ProtocolModules.M3UA_commit= 2544b6bdc76d18313a235fbfdaf0cac04ebdd603 +titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad titan.ProtocolModules.NS_v7.3.0_commit= R.2.A @@ -101,7 +101,7 @@ titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9 +titan.ProtocolModules.SGsAP_13.2.0_commit= 5ccaeab7b3093e2bd8e88eee73c8362d1a2e4f32 titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16815 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: I91a1e13173e059a94fb76858ec1a1879ab1a8686 Gerrit-Change-Number: 16815 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:36:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:36:35 +0000 Subject: Change in osmo-hlr[master]: Revert "add mDNS lookup method to libosmo-mslookup" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16828 ) Change subject: Revert "add mDNS lookup method to libosmo-mslookup" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d Gerrit-Change-Number: 16828 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 15:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:36:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:36:39 +0000 Subject: Change in osmo-hlr[master]: Revert "add osmo-mslookup-client program" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16827 ) Change subject: Revert "add osmo-mslookup-client program" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 Gerrit-Change-Number: 16827 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jan 2020 15:36:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:36:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:36:44 +0000 Subject: Change in osmo-hlr[master]: Revert "add osmo-mslookup-client program" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16827 ) Change subject: Revert "add osmo-mslookup-client program" ...................................................................... Revert "add osmo-mslookup-client program" This reverts commit 637bbfcd9275f8c47212b29b50110f56ba6397bf, as it is a follow-up commit to Change-Id I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 which causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test. Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 --- M .gitignore M configure.ac M contrib/Makefile.am D contrib/dgsm/Makefile.am D contrib/dgsm/osmo-mslookup-pipe.py D contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am D src/mslookup/osmo-mslookup-client.c 8 files changed, 1 insertion(+), 957 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 0965935..eec364a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ src/osmo-hlr-db-tool src/osmo-euse-demo src/gsupclient/gsup-test-client -src/mslookup/osmo-mslookup-client tests/atconfig tests/testsuite diff --git a/configure.ac b/configure.ac index 59261e8..57aecba 100644 --- a/configure.ac +++ b/configure.ac @@ -185,7 +185,6 @@ doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile - contrib/dgsm/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index cfd0b15..3439c97 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1 @@ -SUBDIRS = \ - systemd \ - dgsm \ - $(NULL) +SUBDIRS = systemd diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am deleted file mode 100644 index c759302..0000000 --- a/contrib/dgsm/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - osmo-mslookup-pipe.py \ - osmo-mslookup-socket.py \ - $(NULL) diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py deleted file mode 100755 index b18bf5f..0000000 --- a/contrib/dgsm/osmo-mslookup-pipe.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python3 -# vim: shiftwidth=4 tabstop=4 expandtab -import subprocess -import json - -def query_mslookup(query_str): - result = {'result': 'not-found'} - proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str), - stdout=subprocess.PIPE) - for line in iter(proc.stdout.readline,''): - if not line: - break - response = json.loads(line) - if response.get('result') == 'result': - result = response - print('Response: %r' % response) - return result - -if __name__ == '__main__': - import sys - query_str = '1000-5000 at sip.voice.12345.msisdn' - if len(sys.argv) > 1: - query_str = sys.argv[1] - print('Final result: %r' % query_mslookup(query_str)) diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py deleted file mode 100755 index a26ad9f..0000000 --- a/contrib/dgsm/osmo-mslookup-socket.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python3 -# vim: shiftwidth=4 tabstop=4 expandtab -import socket -import time - -MSLOOKUP_SOCKET_PATH = '/tmp/mslookup' - -def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH): - mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - mslookup_socket.setblocking(True) - mslookup_socket.connect(socket_path) - result = {'result': 'not-found'} - column_names = mslookup_socket.recv(1024).decode('ascii') - if not column_names: - return result - column_names = column_names.split('\t') - mslookup_socket.sendall(query_str.encode('ascii')) - while True: - csv = mslookup_socket.recv(1024).decode('ascii') - if not csv: - break - response = dict(zip(column_names, csv.split('\t'))) - if response.get('result') == 'result': - result = response - print('Response: %r' % response) - return result - -if __name__ == '__main__': - import sys - print( - '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n') - query_str = '1000-5000 at sip.voice.12345.msisdn' - if len(sys.argv) > 1: - query_str = sys.argv[1] - print('Final result: %r' % query_mslookup_socket(query_str)) diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index a720c40..07fb6f4 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -26,12 +26,3 @@ $(LIBOSMOGSM_LIBS) \ $(TALLOC_LIBS) \ $(NULL) - -bin_PROGRAMS = osmo-mslookup-client -osmo_mslookup_client_SOURCES = osmo-mslookup-client.c -osmo_mslookup_client_LDADD = \ - libosmo-mslookup.la \ - $(LIBOSMOCORE_LIBS) \ - $(TALLOC_LIBS) \ - $(NULL) -osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c deleted file mode 100644 index 1c0efe9..0000000 --- a/src/mslookup/osmo-mslookup-client.c +++ /dev/null @@ -1,879 +0,0 @@ -/*! \file osmo-mslookup-client.c - * Distributed GSM: find the location of subscribers, for example by multicast DNS, - * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names). - */ -/* - * (C) 2019 by sysmocom s.f.m.c. GmbH - * (C) 2019 by Neels Hofmeyr - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port" - -static void print_version(void) -{ - printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION); - printf("\n" - "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n" - "Copyright (C) 2019 by Neels Hofmeyr \n" - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n"); -} - -static void print_help() -{ - print_version(); - printf( -"Standalone mslookup client for Distributed GSM\n" -"\n" -"Receiving mslookup results means listening for responses on a socket. Often,\n" -"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n" -"to read responses, because that interferes with the main program (e.g.\n" -"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n" -"that interferes with osmo_select_main(), or an smpp.py uses\n" -"smpplib.client.listen() as main loop, etc.).\n" -"\n" -"This program provides a trivial solution, by outsourcing the mslookup main loop\n" -"to a separate process. Communication is done via cmdline arg and stdout pipe or\n" -"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n" -"\n" -"This can be done one-shot, i.e. exit as soon as the response has been\n" -"determined, or in daemon form, i.e. continuously listen for requests and return\n" -"responses.\n" -"\n" -"About running a local daemon: it is unintuitive to connect to a socket to solve\n" -"a problem of reading from a socket -- it seems like just more of the same\n" -"problem. The reasons why the daemon is in fact useful are:\n" -"- The osmo-mslookup-client daemon will return only those results matching\n" -" requests issued on that socket connection.\n" -"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n" -" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n" -" to asynchronously receive responses from remote servers.\n" -"- Only one long-lived multicast socket needs to be opened instead of a new\n" -" socket for each request.\n" -"\n" -"Output is in CSV or json, see --format. The default is tab-separated CSV\n" -"with these columns:\n" -CSV_HEADERS "\n" -"\n" -"One-shot operation example:\n" -"$ osmo-mslookup-client 1000- at sip.voice.12345.msisdn -f json\n" -"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n" -"$\n" -"\n" -"Daemon operation example:\n" -"$ osmo-mslookup-client -s /tmp/mslookup -d\n" -"(and a client program then connects to /tmp/mslookup, find an implementation\n" -"example below)\n" -"\n" -"Integrating with calling programs can be done by:\n" -"- call osmo-mslookup-client with the query string as argument.\n" -" It will open a multicast DNS socket, send out a query and wait for the\n" -" matching response. It will print the result on stdout and exit.\n" -" This method launches a new process for every mslookup query,\n" -" and creates a short-lived multicast listener for each invocation.\n" -" This is fine for low activity, but does not scale well.\n" -"\n" -"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n" -" Individual queries can be sent by connecting to that unix domain socket,\n" -" blockingly reading the response when it arrives and disconnecting.\n" -" This way only one process keeps one multicast listener open.\n" -" Callers can connect to this socket without spawning processes.\n" -" This is recommended for scale.\n" -"\n" -"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n" -"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n" -"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n" -"\n" -"\n" -"Options:\n" -"\n" -"[[delay-][timeout]@]service.number.id\n" -" A service query string with optional individual timeout.\n" -" The same format is also used on a daemon socket, if any.\n" -" The timeout consists of the min-delay and the timeout numbers,\n" -" corresponding to the --min-delay and --timeout options, in milliseconds.\n" -" These options apply if a query string lacks own numbers.\n" -" Examples:\n" -" gsup.hlr.1234567.imsi Use cmdline timeout settings\n" -" 5000 at gsup.hlr.1234567.imsi Return N results for 5 seconds\n" -" 1000-5000 at sip.voice.123.msisdn Same, but silent for first second\n" -" 10000- at smpp.sms.567.msisdn Return 1 result after 10 seconds\n" -"\n" -"--format -f csv (default)\n" -" Format result lines in CSV format.\n" -"--no-csv-headers -H\n" -" If the format is 'csv', by default, the first output line prints the\n" -" CSV headers used for CSV output format. This option disables these CSV\n" -" headers.\n" -"\n" -"--format -f json\n" -" Format result lines in json instead of semicolon separated, like:\n" -" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n" -"\n" -"--daemon -d\n" -" Keep running after a request has been serviced\n" -"\n" -"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n" -"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n" -" Set multicast IP address / port to send mDNS requests and listen for\n" -" mDNS reponses\n" -"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n" -" Append this suffix to each mDNS query's domain to avoid colliding with the\n" -" top-level domains administrated by IANA.\n" -"\n" -"--min-delay -t 1000 (in milliseconds)\n" -" Set minimum delay to wait before returning any results.\n" -" When this timeout has elapsed, the best current result is returned,\n" -" if any is available.\n" -" Responses arriving after the min-delay has elapsed which have a younger\n" -" age than previous results are returned immediately.\n" -" Note: When a response with age of zero comes in, the result is returned\n" -" immediately and the request is discarded: non-daemon mode exits, daemon\n" -" mode ignores later results.\n" -"\n" -"--timeout -T 1000 (in milliseconds)\n" -" Set timeout after which to stop listening for responses.\n" -" If this is smaller than -t, the value from -t will be used for -T as well.\n" -" Note: When a response with age of zero comes in, the result is returned\n" -" immediately and the request is discarded: non-daemon mode exits, daemon\n" -" mode ignores later results.\n" -"\n" -"--socket -s /path/to/unix-domain-socket\n" -" Listen to requests from and write responses to a UNIX domain socket.\n" -"\n" -"--send -S \n" -" Do not query, but send an mslookup result. This is useful only for\n" -" testing. Examples:\n" -" --send foo.123.msisdn 300 23.42.17.11 1234\n" -" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n" -" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n" -"\n" -"--quiet -q\n" -" Do not print errors to stderr, do not log to stderr.\n" -"\n" -"--help -h\n" -" This help\n" -); -} - -enum result_format { - FORMAT_CSV = 0, - FORMAT_JSON, -}; - -static struct { - bool daemon; - struct osmo_sockaddr_str mdns_addr; - uint32_t min_delay; - uint32_t timeout; - const char *socket_path; - const char *format_str; - const char *mdns_domain_suffix; - bool csv_headers; - bool send; - bool quiet; -} cmdline_opts = { - .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT }, - .min_delay = 1000, - .timeout = 1000, - .csv_headers = true, - .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT, -}; - -#define print_error(fmt, args...) do { \ - if (!cmdline_opts.quiet) \ - fprintf(stderr, fmt, ##args); \ - } while (0) - -char g_buf[1024]; - -long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc) -{ - long long int val; - char *endptr; - if (rc) - *rc = -1; - if (!arg) - return -1; - errno = 0; - val = strtoll(arg, &endptr, 10); - if (errno || val < minval || val > maxval || *endptr) - return -1; - if (rc) - *rc = 0; - return val; -} - -int cb_doing_nothing(struct osmo_fd *fd, unsigned int what) -{ - return 0; -} - -/* --send: Just send a response, for manual testing. */ -int do_send(int argc, char ** argv) -{ - /* parse args */ -#define ARG(NR) ((argc > NR)? argv[NR] : NULL) - const char *query_str = ARG(0); - const char *age_str = ARG(1); - const char *ip_strs[2][2] = { - { ARG(2), ARG(3) }, - { ARG(4), ARG(5) }, - }; - struct osmo_mslookup_query q = {}; - struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT }; - int i; - int rc; - void *ctx = talloc_named_const(NULL, 0, __func__); - struct osmo_mdns_sock *sock; - - if (!query_str) { - print_error("--send needs a query string like foo.123456.imsi\n"); - return 1; - } - if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) { - print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n", - query_str); - return 1; - } - - if (!age_str) { - print_error("--send needs an age\n"); - return 1; - } - r.age = parse_int(0, UINT32_MAX, age_str, &rc); - if (rc) { - print_error("invalid age\n"); - return 1; - } - - for (i = 0; i < 2; i++) { - struct osmo_sockaddr_str addr; - uint16_t port; - if (!ip_strs[i][0]) - continue; - port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc); - if (rc) { - print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL"); - return 1; - } - if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) { - print_error("invalid IP addr: %s\n", ip_strs[i][0]); - return 1; - } - if (addr.af == AF_INET) - r.host_v4 = addr; - else - r.host_v6 = addr; - } - - printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr), - osmo_mslookup_result_name_c(ctx, &q, &r)); - - rc = 1; - sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, - cb_doing_nothing, NULL, 0); - if (!sock) { - print_error("unable to open mDNS socket\n"); - goto exit_cleanup; - } - - struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); - if (!msg) { - print_error("unable to encode mDNS response\n"); - goto exit_cleanup; - } - - if (osmo_mdns_sock_send(sock, msg)) { - print_error("unable to send mDNS message\n"); - goto exit_cleanup; - } - - rc = 0; -exit_cleanup: - osmo_mdns_sock_cleanup(sock); - talloc_free(ctx); - return rc; -} - -static struct { - void *ctx; - unsigned int requests_handled; - struct osmo_fd socket_ofd; - struct osmo_mslookup_client *mslookup_client; - struct llist_head queries; - struct llist_head socket_clients; - enum result_format format; -} globals = { - .queries = LLIST_HEAD_INIT(globals.queries), - .socket_clients = LLIST_HEAD_INIT(globals.socket_clients), -}; - -typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r); - -void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) -{ - struct osmo_strbuf sb = { .buf=buf, .len=buflen }; - OSMO_STRBUF_PRINTF(sb, "%s", query_str); - - if (!r) - OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t"); - else { - OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc)); - OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last"); - OSMO_STRBUF_PRINTF(sb, "\t%u", r->age); - switch (r->rc) { - case OSMO_MSLOOKUP_RC_RESULT: - if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) - OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port); - else - OSMO_STRBUF_PRINTF(sb, "\t\t"); - if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) - OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port); - else - OSMO_STRBUF_PRINTF(sb, "\t\t"); - break; - default: - OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t"); - break; - } - } -} - -void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) -{ - struct osmo_strbuf sb = { .buf=buf, .len=buflen }; - OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str); - - if (!r) - OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\""); - else { - OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc)); - OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false"); - OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age); - if (r->rc == OSMO_MSLOOKUP_RC_RESULT) { - if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) - OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port); - if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) - OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port); - } - } - OSMO_STRBUF_PRINTF(sb, "}"); -} - -formatter_t formatters[] = { - [FORMAT_CSV] = formatter_csv, - [FORMAT_JSON] = formatter_json, -}; - -void respond_str_stdout(const char *str) { - fprintf(stdout, "%s\n", str); - fflush(stdout); -} - -void start_query_str(const char *query_str); -void start_query_strs(char **query_strs, size_t query_strs_len); - -struct socket_client { - struct llist_head entry; - struct osmo_fd ofd; - char query_str[1024]; -}; - -static void socket_client_close(struct socket_client *c) -{ - struct osmo_fd *ofd = &c->ofd; - - close(ofd->fd); - ofd->fd = -1; - osmo_fd_unregister(ofd); - - llist_del(&c->entry); - talloc_free(c); -} - -void socket_client_respond_result(struct socket_client *c, const char *response) -{ - write(c->ofd.fd, response, strlen(response)); -} - -static int socket_read_cb(struct osmo_fd *ofd) -{ - struct socket_client *c = ofd->data; - int rc; - char rxbuf[1024]; - char *query_with_timeout; - char *query_str; - char *at; - - rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0); - if (rc == 0) - goto close; - - if (rc < 0) { - if (errno == EAGAIN) - return 0; - goto close; - } - - if (rc >= sizeof(c->query_str)) - goto close; - - rxbuf[rc] = '\0'; - query_with_timeout = strtok(rxbuf, "\r\n"); - at = strchr(query_with_timeout, '@'); - query_str = at ? at + 1 : query_with_timeout; - - if (c->query_str[0]) { - print_error("ERROR: Only one query per client connect is allowed;" - " received '%s' and '%s' on the same connection\n", - c->query_str, query_str); - formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL); - socket_client_respond_result(c, g_buf); - return 0; - } - - OSMO_STRLCPY_ARRAY(c->query_str, query_str); - start_query_str(query_with_timeout); - printf("query: %s\n", query_with_timeout); - return rc; - -close: - socket_client_close(c); - return -1; -} - -static int socket_cb(struct osmo_fd *ofd, unsigned int flags) -{ - int rc = 0; - - if (flags & BSC_FD_READ) - rc = socket_read_cb(ofd); - if (rc < 0) - return rc; - - return rc; -} - -int socket_accept(struct osmo_fd *ofd, unsigned int flags) -{ - struct socket_client *c; - struct sockaddr_un un_addr; - socklen_t len; - int rc; - - len = sizeof(un_addr); - rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len); - if (rc < 0) { - print_error("Failed to accept a new connection\n"); - return -1; - } - - c = talloc_zero(globals.ctx, struct socket_client); - OSMO_ASSERT(c); - c->ofd.fd = rc; - c->ofd.when = BSC_FD_READ; - c->ofd.cb = socket_cb; - c->ofd.data = c; - - if (osmo_fd_register(&c->ofd) != 0) { - print_error("Failed to register new connection fd\n"); - close(c->ofd.fd); - c->ofd.fd = -1; - talloc_free(c); - return -1; - } - - llist_add(&c->entry, &globals.socket_clients); - - if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) - write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); - - return 0; -} - -int socket_init(const char *sock_path) -{ - struct osmo_fd *ofd = &globals.socket_ofd; - int rc; - - ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND); - if (ofd->fd < 0) { - print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno)); - return -1; - } - - ofd->when = BSC_FD_READ; - ofd->cb = socket_accept; - - rc = osmo_fd_register(ofd); - if (rc < 0) { - print_error("Could not register listen fd: %d\n", rc); - close(ofd->fd); - return rc; - } - return 0; -} - -void socket_close() -{ - struct socket_client *c, *n; - llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) - socket_client_close(c); - if (osmo_fd_is_registered(&globals.socket_ofd)) { - close(globals.socket_ofd.fd); - globals.socket_ofd.fd = -1; - osmo_fd_unregister(&globals.socket_ofd); - } -} - -struct query { - struct llist_head entry; - - char query_str[128]; - struct osmo_mslookup_query query; - uint32_t handle; -}; - -void respond_result(const char *query_str, const struct osmo_mslookup_result *r) -{ - struct socket_client *c, *n; - formatters[globals.format](g_buf, sizeof(g_buf), query_str, r); - respond_str_stdout(g_buf); - - llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) { - if (!strcmp(query_str, c->query_str)) { - socket_client_respond_result(c, g_buf); - if (r->last) - socket_client_close(c); - } - } - if (r->last) - globals.requests_handled++; -} - -void respond_err(const char *query_str) -{ - respond_result(query_str, NULL); -} - -struct query *query_by_handle(uint32_t request_handle) -{ - struct query *q; - llist_for_each_entry(q, &globals.queries, entry) { - if (request_handle == q->handle) - return q; - } - return NULL; -} - -void mslookup_result_cb(struct osmo_mslookup_client *client, - uint32_t request_handle, - const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result) -{ - struct query *q = query_by_handle(request_handle); - if (!q) - return; - respond_result(q->query_str, result); - if (result->last) { - llist_del(&q->entry); - talloc_free(q); - } -} - -void start_query_str(const char *query_str) -{ - struct query *q; - const char *domain_str = query_str; - char *at; - struct osmo_mslookup_query_handling h = { - .min_wait_milliseconds = cmdline_opts.min_delay, - .result_timeout_milliseconds = cmdline_opts.timeout, - .result_cb = mslookup_result_cb, - }; - - at = strchr(query_str, '@'); - if (at) { - int rc; - char timeouts[16]; - char *dash; - char *timeout; - - domain_str = at + 1; - - h.min_wait_milliseconds = h.result_timeout_milliseconds = 0; - - if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) { - print_error("ERROR: timeouts part too long in query string\n"); - respond_err(domain_str); - return; - } - - dash = strchr(timeouts, '-'); - if (dash) { - char min_delay[16]; - osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts); - h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc); - if (rc) { - print_error("ERROR: invalid min-delay number: %s\n", min_delay); - respond_err(domain_str); - return; - } - timeout = dash + 1; - } else { - timeout = timeouts; - } - if (*timeout) { - h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc); - if (rc) { - print_error("ERROR: invalid timeout number: %s\n", timeout); - respond_err(domain_str); - return; - } - } - } - - if (strlen(domain_str) >= sizeof(q->query_str)) { - print_error("ERROR: query string is too long: '%s'\n", domain_str); - respond_err(domain_str); - return; - } - - q = talloc_zero(globals.ctx, struct query); - OSMO_ASSERT(q); - OSMO_STRLCPY_ARRAY(q->query_str, domain_str); - - if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) { - print_error("ERROR: cannot parse query string: '%s'\n", domain_str); - respond_err(domain_str); - talloc_free(q); - return; - } - - q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h); - if (!q->handle) { - print_error("ERROR: cannot send query: '%s'\n", domain_str); - respond_err(domain_str); - talloc_free(q); - return; - } - - llist_add(&q->entry, &globals.queries); -} - -void start_query_strs(char **query_strs, size_t query_strs_len) -{ - int i; - for (i = 0; i < query_strs_len; i++) - start_query_str(query_strs[i]); -} - -int main(int argc, char **argv) -{ - int rc = EXIT_FAILURE; - globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client"); - - osmo_init_logging2(globals.ctx, NULL); - log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); - log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); - log_set_print_level(osmo_stderr_target, 1); - log_set_print_category(osmo_stderr_target, 1); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_print_extended_timestamp(osmo_stderr_target, 1); - log_set_use_color(osmo_stderr_target, 0); - - while (1) { - int c; - long long int val; - char *endptr; - int option_index = 0; - - static struct option long_options[] = { - { "format", 1, 0, 'f' }, - { "no-csv-headers", 0, 0, 'H' }, - { "daemon", 0, 0, 'd' }, - { "mdns-ip", 1, 0, 'm' }, - { "mdns-port", 1, 0, 'M' }, - { "mdns-domain-suffix", 1, 0, 'D' }, - { "timeout", 1, 0, 'T' }, - { "min-delay", 1, 0, 't' }, - { "socket", 1, 0, 's' }, - { "send", 0, 0, 'S' }, - { "quiet", 0, 0, 'q' }, - { "help", 0, 0, 'h' }, - { "version", 0, 0, 'V' }, - {} - }; - -#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \ - int _rc; \ - TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \ - if (_rc) { \ - print_error("Invalid " #TARGET ": %s\n", optarg); \ - goto program_exit; \ - } \ - } while (0) - - c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index); - - if (c == -1) - break; - - switch (c) { - case 'f': - cmdline_opts.format_str = optarg; - break; - case 'H': - cmdline_opts.csv_headers = false; - break; - case 'd': - cmdline_opts.daemon = true; - break; - case 'm': - if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port) - || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) { - print_error("Invalid mDNS IP address: %s\n", optarg); - goto program_exit; - } - break; - case 'M': - PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535); - break; - case 'D': - cmdline_opts.mdns_domain_suffix = optarg; - break; - case 't': - PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX); - break; - case 'T': - PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX); - break; - case 's': - cmdline_opts.socket_path = optarg; - break; - case 'S': - cmdline_opts.send = true; - break; - case 'q': - cmdline_opts.quiet = true; - break; - - case 'h': - print_help(); - rc = 0; - goto program_exit; - case 'V': - print_version(); - rc = 0; - goto program_exit; - - default: - /* catch unknown options *as well as* missing arguments. */ - print_error("Error in command line options. Exiting.\n"); - goto program_exit; - } - } - - if (cmdline_opts.send) { - if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) { - print_error("--send option cannot have any listening related args."); - } - rc = do_send(argc - optind, argv + optind); - goto program_exit; - } - - if (!cmdline_opts.daemon && !(argc - optind)) { - print_help(); - goto program_exit; - } - - if (cmdline_opts.daemon && !cmdline_opts.timeout) { - print_error("In daemon mode, --timeout must not be zero.\n"); - goto program_exit; - } - - if (cmdline_opts.quiet) - log_target_destroy(osmo_stderr_target); - - if (cmdline_opts.format_str) { - if (osmo_str_startswith("json", cmdline_opts.format_str)) - globals.format = FORMAT_JSON; - else if (osmo_str_startswith("csv", cmdline_opts.format_str)) - globals.format = FORMAT_CSV; - else { - print_error("Invalid format: %s\n", cmdline_opts.format_str); - goto program_exit; - } - } - - if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) - respond_str_stdout(CSV_HEADERS); - - globals.mslookup_client = osmo_mslookup_client_new(globals.ctx); - if (!globals.mslookup_client - || !osmo_mslookup_client_add_mdns(globals.mslookup_client, - cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, - -1, cmdline_opts.mdns_domain_suffix)) { - print_error("Failed to start mDNS client\n"); - goto program_exit; - } - - if (cmdline_opts.socket_path) { - if (socket_init(cmdline_opts.socket_path)) - goto program_exit; - } - - start_query_strs(&argv[optind], argc - optind); - - while (1) { - osmo_select_main_ctx(0); - - if (!cmdline_opts.daemon - && globals.requests_handled - && llist_empty(&globals.queries)) - break; - } - - rc = 0; -program_exit: - osmo_mslookup_client_free(globals.mslookup_client); - socket_close(); - log_fini(); - talloc_free(globals.ctx); - return rc; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I43084ac3b24684f17df43fefc82019e44baaa236 Gerrit-Change-Number: 16827 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 15:36:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 15:36:44 +0000 Subject: Change in osmo-hlr[master]: Revert "add mDNS lookup method to libosmo-mslookup" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16828 ) Change subject: Revert "add mDNS lookup method to libosmo-mslookup" ...................................................................... Revert "add mDNS lookup method to libosmo-mslookup" This reverts commit f10463c5fc6d9e786ab7c648d99f7450f9a25906, as it causes all OBS osmo-hlr builds to fail in the mslookup_client_mdns test. Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am D include/osmocom/mslookup/Makefile.am D include/osmocom/mslookup/mdns.h D include/osmocom/mslookup/mdns_msg.h D include/osmocom/mslookup/mdns_rfc.h D include/osmocom/mslookup/mdns_sock.h D include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am D src/mslookup/mdns.c D src/mslookup/mdns_msg.c D src/mslookup/mdns_rfc.c D src/mslookup/mdns_sock.c D src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am D tests/mslookup/mdns_test.c D tests/mslookup/mdns_test.err D tests/mslookup/mslookup_client_mdns_test.c D tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 0 insertions(+), 2,829 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index eec364a..acfea84 100644 --- a/.gitignore +++ b/.gitignore @@ -51,8 +51,6 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump -tests/mslookup/mdns_test -tests/mslookup/mslookup_client_mdns_test tests/mslookup/mslookup_client_test tests/mslookup/mslookup_test diff --git a/configure.ac b/configure.ac index 57aecba..217df9f 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,6 @@ include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile - include/osmocom/mslookup/Makefile libosmo-gsup-client.pc libosmo-mslookup.pc sql/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 9827950..e9a7126 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,10 +2,7 @@ nobase_include_HEADERS = \ osmocom/gsupclient/gsup_client.h \ - osmocom/mslookup/mdns.h \ - osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ - osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index b75c86a..dbc2344 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = \ hlr \ - mslookup \ $(NULL) diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am deleted file mode 100644 index 72ccd94..0000000 --- a/include/osmocom/mslookup/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# most headers here are installed, see /include/Makefile.am - -noinst_HEADERS = \ - mdns_msg.h \ - mdns_rfc.h \ - $(NULL) diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h deleted file mode 100644 index b62e95f..0000000 --- a/include/osmocom/mslookup/mdns.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -/*! \file mdns.h */ - -#pragma once - -#include -#include - -#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org" - -struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const char *domain_suffix); - -struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, - uint16_t *packet_id, const char *domain_suffix); - -struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result, const char *domain_suffix); - -int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, - struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, - const char *domain_suffix); diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h deleted file mode 100644 index ae7dd17..0000000 --- a/include/osmocom/mslookup/mdns_msg.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include -#include "mdns_rfc.h" - -struct osmo_mdns_record { - struct llist_head list; - enum osmo_mdns_rfc_record_type type; - uint16_t length; - uint8_t *data; -}; - -struct osmo_mdns_msg_request { - uint16_t id; - char *domain; - enum osmo_mdns_rfc_record_type type; -}; - -struct osmo_mdns_msg_answer { - uint16_t id; - char *domain; - /*! list of osmo_mdns_record. */ - struct llist_head records; -}; - -int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req); -struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len); - -void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer); -int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans); -struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len); -int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans); - -struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...); -int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, - char *key_buf, size_t key_size, char *value_buf, size_t value_size); diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h deleted file mode 100644 index 9d6be5a..0000000 --- a/include/osmocom/mslookup/mdns_rfc.h +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include -#include -#include -#include -#include - -/* RFC 1035 2.3.4 */ -#define OSMO_MDNS_RFC_MAX_NAME_LEN 255 - -/* RFC 1035 3.3 */ -#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256 - -enum osmo_mdns_rfc_record_type { - OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0, - - /* RFC 1035 3.2.2 */ - OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */ - OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */ - - /* RFC 3596 2.1 */ - OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */ - - /* RFC 1035 3.2.3 */ - OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */ -}; - -enum osmo_mdns_rfc_class { - OSMO_MDNS_RFC_CLASS_UNKNOWN = 0, - - /* RFC 1035 3.2.4 */ - OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */ - - /* RFC 1035 3.2.5 */ - OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */ -}; - -/* RFC 1035 4.1.1 */ -struct osmo_mdns_rfc_header { -#if OSMO_IS_LITTLE_ENDIAN - uint16_t id; - uint8_t rd:1, - tc:1, - aa:1, - opcode:4, - qr:1; /* QR (0: query, 1: response) */ - uint8_t rcode:4, - z:3, - ra:1; - uint16_t qdcount; /* Number of questions */ - uint16_t ancount; /* Number of answers */ - uint16_t nscount; /* Number of authority records */ - uint16_t arcount; /* Number of additional records */ -#elif OSMO_IS_BIG_ENDIAN -/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint16_t id; - uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1; - uint8_t ra:1, z:3, rcode:4; - uint16_t qdcount; - uint16_t ancount; - uint16_t nscount; - uint16_t arcount; -#endif -} __attribute__ ((packed)); - -/* RFC 1035 4.1.2 */ -struct osmo_mdns_rfc_question { - char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */ - enum osmo_mdns_rfc_record_type qtype; - enum osmo_mdns_rfc_class qclass; -}; - -/* RFC 1035 4.1.3 */ -struct osmo_mdns_rfc_record { - char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */ - enum osmo_mdns_rfc_record_type type; - enum osmo_mdns_rfc_class class; - uint32_t ttl; - uint16_t rdlength; - uint8_t *rdata; -}; - -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); - -void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); -int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); - -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); -struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); - -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); -struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, - size_t *record_len); diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h deleted file mode 100644 index 615e971..0000000 --- a/include/osmocom/mslookup/mdns_sock.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once -#include -#include -#include - -struct osmo_mdns_sock { - struct osmo_fd osmo_fd; - struct addrinfo *ai; -}; - -struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, - int (*cb)(struct osmo_fd *fd, unsigned int what), - void *data, unsigned int priv_nr); -int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg); -void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock); diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h deleted file mode 100644 index e699107..0000000 --- a/include/osmocom/mslookup/mslookup_client_mdns.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once - -#include - -struct osmo_mslookup_client; -struct osmo_mslookup_client_method; - -/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational - * Scoped range, https://tools.ietf.org/html/rfc2365 . */ -#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42" -#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane? -#define OSMO_MSLOOKUP_MDNS_PORT 4266 - -struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, - uint16_t port, int initial_packet_id, - const char *domain_suffix); - -const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method); - -const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method); diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 07fb6f4..01be401 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -10,14 +10,9 @@ lib_LTLIBRARIES = libosmo-mslookup.la libosmo_mslookup_la_SOURCES = \ - mdns.c \ - mdns_msg.c \ - mdns_rfc.c \ - mdns_sock.c \ mslookup.c \ mslookup_client.c \ mslookup_client_fake.c \ - mslookup_client_mdns.c \ $(NULL) libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c deleted file mode 100644 index 4742a7c..0000000 --- a/src/mslookup/mdns.c +++ /dev/null @@ -1,425 +0,0 @@ -/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high - * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include - -static struct msgb *osmo_mdns_msgb_alloc(const char *label) -{ - return msgb_alloc(1024, label); -} - -/*! Combine the mslookup query service, ID and ID type into a domain string. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success, - * NULL on failure. - */ -static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix) -{ - const char *id; - - /* Get id from query */ - switch (query->id.type) { - case OSMO_MSLOOKUP_ID_IMSI: - id = query->id.imsi; - break; - case OSMO_MSLOOKUP_ID_MSISDN: - id = query->id.msisdn; - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type); - return NULL; - } - - return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type), - domain_suffix); -} - -/*! Split up query service, ID and ID type from a domain string into a mslookup query. - * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org" - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we - * remove it in this function. Example: "mdns.osmocom.org" - */ -int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix) -{ - int domain_len = strlen(domain) - strlen(domain_suffix) - 1; - char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN]; - - if (domain_len <= 0 || domain_len >= sizeof(domain_buf)) - return -EINVAL; - - if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0) - return -EINVAL; - - memcpy(domain_buf, domain, domain_len); - domain_buf[domain_len] = '\0'; - return osmo_mslookup_query_init_from_domain_str(query, domain_buf); -} - -/*! Encode a mslookup query into a mDNS packet. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns msgb, or NULL on error. - */ -struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const char *domain_suffix) -{ - struct osmo_mdns_msg_request req = {0}; - struct msgb *msg = osmo_mdns_msgb_alloc(__func__); - - req.id = packet_id; - req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL; - req.domain = domain_from_query(ctx, query, domain_suffix); - if (!req.domain) - goto error; - if (osmo_mdns_msg_request_encode(ctx, msg, &req)) - goto error; - talloc_free(req.domain); - return msg; -error: - msgb_free(msg); - talloc_free(req.domain); - return NULL; -} - -/*! Decode a mDNS request packet into a mslookup query. - * \param[out] packet_id the result must be sent with the same packet_id. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns allocated mslookup query on success, NULL on error. - */ -struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, - uint16_t *packet_id, const char *domain_suffix) -{ - struct osmo_mdns_msg_request *req = NULL; - struct osmo_mslookup_query *query = NULL; - - req = osmo_mdns_msg_request_decode(ctx, data, data_len); - if (!req) - return NULL; - - query = talloc_zero(ctx, struct osmo_mslookup_query); - OSMO_ASSERT(query); - if (query_from_domain(query, req->domain, domain_suffix) < 0) - goto error_free; - - *packet_id = req->id; - talloc_free(req); - return query; -error_free: - talloc_free(req); - talloc_free(query); - return NULL; -} - -/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it. - * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str. - * \param[in] rec single record of the abstracted list of mDNS records - * \returns 0 on success, -EINVAL on error. - */ -static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec) -{ - switch (rec->type) { - case OSMO_MDNS_RFC_RECORD_TYPE_A: - if (rec->length != 4) { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n"); - return -EINVAL; - } - osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0); - break; - case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: - if (rec->length != 16) { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n"); - return -EINVAL; - } - osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0); - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); - return -EINVAL; - } - return 0; -} - -/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet. - * - * The records in the packet are ordered as follows: - * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or - * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). - * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. - * - * \param[in] packet_id as received in osmo_mdns_query_decode(). - * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn"). - * \param[in] result holds the age, IPs and ports of the queried service. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns msg on success, NULL on error. - */ -struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, - const struct osmo_mslookup_result *result, const char *domain_suffix) -{ - struct osmo_mdns_msg_answer ans = {}; - struct osmo_mdns_record *rec_age = NULL; - struct osmo_mdns_record rec_ip_v4 = {0}; - struct osmo_mdns_record rec_ip_v6 = {0}; - struct osmo_mdns_record *rec_ip_v4_port = NULL; - struct osmo_mdns_record *rec_ip_v6_port = NULL; - struct in_addr rec_ip_v4_in; - struct in6_addr rec_ip_v6_in; - struct msgb *msg = osmo_mdns_msgb_alloc(__func__); - char buf[256]; - - ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode"); - - /* Prepare answer (ans) */ - ans.domain = domain_from_query(ctx, query, domain_suffix); - if (!ans.domain) - goto error; - ans.id = packet_id; - INIT_LLIST_HEAD(&ans.records); - - /* Record for age */ - rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age); - OSMO_ASSERT(rec_age); - llist_add_tail(&rec_age->list, &ans.records); - - /* Records for IPv4 */ - if (osmo_sockaddr_str_is_set(&result->host_v4)) { - if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A; - rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in; - rec_ip_v4.length = sizeof(rec_ip_v4_in); - llist_add_tail(&rec_ip_v4.list, &ans.records); - - rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port); - OSMO_ASSERT(rec_ip_v4_port); - llist_add_tail(&rec_ip_v4_port->list, &ans.records); - } - - /* Records for IPv6 */ - if (osmo_sockaddr_str_is_set(&result->host_v6)) { - if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; - rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in; - rec_ip_v6.length = sizeof(rec_ip_v6_in); - llist_add_tail(&rec_ip_v6.list, &ans.records); - - rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port); - OSMO_ASSERT(rec_ip_v6_port); - llist_add_tail(&rec_ip_v6_port->list, &ans.records); - } - - if (osmo_mdns_msg_answer_encode(ctx, msg, &ans)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - goto error; - } - talloc_free(ctx); - return msg; -error: - msgb_free(msg); - talloc_free(ctx); - return NULL; -} - -static int decode_uint32_t(const char *str, uint32_t *val) -{ - long long int lld; - char *endptr = NULL; - *val = 0; - errno = 0; - lld = strtoll(str, &endptr, 10); - if (errno || !endptr || *endptr) - return -EINVAL; - if (lld < 0 || lld > UINT32_MAX) - return -EINVAL; - *val = lld; - return 0; -} - -static int decode_port(const char *str, uint16_t *port) -{ - uint32_t val; - if (decode_uint32_t(str, &val)) - return -EINVAL; - if (val > 65535) - return -EINVAL; - *port = val; - return 0; -} - -/*! Read expected mDNS records into mslookup result. - * - * The records in the packet must be ordered as follows: - * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or - * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). - * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. - * - * \param[out] result holds the age, IPs and ports of the queried service. - * \param[in] ans abstracted mDNS answer with a list of resource records. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans) -{ - struct osmo_mdns_record *rec; - char txt_key[64]; - char txt_value[64]; - bool found_age = false; - bool found_ip_v4 = false; - bool found_ip_v6 = false; - struct osmo_sockaddr_str *expect_port_for = NULL; - - *result = (struct osmo_mslookup_result){}; - - result->rc = OSMO_MSLOOKUP_RC_NONE; - - llist_for_each_entry(rec, &ans->records, list) { - switch (rec->type) { - case OSMO_MDNS_RFC_RECORD_TYPE_A: - if (expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'A' record found, but still expecting a 'port' value first\n"); - return -EINVAL; - } - if (found_ip_v4) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n"); - return -EINVAL; - } - found_ip_v4 = true; - expect_port_for = &result->host_v4; - if (sockaddr_str_from_mdns_record(expect_port_for, rec)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n"); - return -EINVAL; - } - break; - case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: - if (expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'AAAA' record found, but still expecting a 'port' value first\n"); - return -EINVAL; - } - if (found_ip_v6) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n"); - return -EINVAL; - } - found_ip_v6 = true; - expect_port_for = &result->host_v6; - if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n"); - return -EINVAL; - } - break; - case OSMO_MDNS_RFC_RECORD_TYPE_TXT: - if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key), - txt_value, sizeof(txt_value)) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n"); - return -EINVAL; - } - if (strcmp(txt_key, "age") == 0) { - if (found_age) { - LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n"); - return -EINVAL; - } - found_age = true; - if (decode_uint32_t(txt_value, &result->age)) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value); - return -EINVAL; - } - } else if (strcmp(txt_key, "port") == 0) { - if (!expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n"); - return -EINVAL; - } - if (decode_port(txt_value, &expect_port_for->port)) { - LOGP(DMSLOOKUP, LOGL_ERROR, - "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value); - return -EINVAL; - } - expect_port_for = NULL; - } else { - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key); - return -EINVAL; - } - break; - default: - LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); - return -EINVAL; - } - } - - /* Check if everything was found */ - if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) { - LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n"); - return -EINVAL; - } - - result->rc = OSMO_MSLOOKUP_RC_RESULT; - return 0; -} - -/*! Decode a mDNS answer packet into a mslookup result, query and packet_id. - * \param[out] packet_id same ID as sent in the request packet. - * \param[out] query the original query (service, ID, ID type). - * \param[out] result holds the age, IPs and ports of the queried service. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, - struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, - const char *domain_suffix) -{ - int rc = -EINVAL; - struct osmo_mdns_msg_answer *ans; - ans = osmo_mdns_msg_answer_decode(ctx, data, data_len); - if (!ans) - goto exit_free; - - if (query_from_domain(query, ans->domain, domain_suffix) < 0) - goto exit_free; - - if (osmo_mdns_result_from_answer(result, ans) < 0) - goto exit_free; - - *packet_id = ans->id; - rc = 0; - -exit_free: - talloc_free(ans); - return rc; -} diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c deleted file mode 100644 index da65fef..0000000 --- a/src/mslookup/mdns_msg.c +++ /dev/null @@ -1,261 +0,0 @@ -/* High level mDNS encoding and decoding functions for whole messages: - * Request message (header, question) - * Answer message (header, resource record 1, ... resource record N)*/ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include - -/*! Encode request message into one mDNS packet, consisting of the header section and one question section. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req) -{ - struct osmo_mdns_rfc_header hdr = {0}; - struct osmo_mdns_rfc_question qst = {0}; - - hdr.id = req->id; - hdr.qdcount = 1; - osmo_mdns_rfc_header_encode(msg, &hdr); - - qst.domain = req->domain; - qst.qtype = req->type; - qst.qclass = OSMO_MDNS_RFC_CLASS_IN; - if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) - return -EINVAL; - - return 0; -} - -/*! Decode request message from a mDNS packet, consisting of the header section and one question section. - * \returns allocated request message on success, NULL on error. - */ -struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_header hdr = {0}; - size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); - struct osmo_mdns_rfc_question* qst = NULL; - struct osmo_mdns_msg_request *ret = NULL; - - if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0) - return NULL; - - qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len); - if (!qst) - return NULL; - - ret = talloc_zero(ctx, struct osmo_mdns_msg_request); - ret->id = hdr.id; - ret->domain = talloc_strdup(ret, qst->domain); - ret->type = qst->qtype; - - talloc_free(qst); - return ret; -} - -/*! Initialize the linked list for resource records in a answer message. */ -void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans) -{ - *ans = (struct osmo_mdns_msg_answer){}; - INIT_LLIST_HEAD(&ans->records); -} - -/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records. - * - * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of - * "message compression", which would send a question section with the domain before the resource records, and then - * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4). - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans) -{ - struct osmo_mdns_rfc_header hdr = {0}; - struct osmo_mdns_record *ans_record; - - hdr.id = ans->id; - hdr.qr = 1; - hdr.ancount = llist_count(&ans->records); - osmo_mdns_rfc_header_encode(msg, &hdr); - - llist_for_each_entry(ans_record, &ans->records, list) { - struct osmo_mdns_rfc_record rec = {0}; - - rec.domain = ans->domain; - rec.type = ans_record->type; - rec.class = OSMO_MDNS_RFC_CLASS_IN; - rec.ttl = 0; - rec.rdlength = ans_record->length; - rec.rdata = ans_record->data; - - if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) - return -EINVAL; - } - - return 0; -} - -/*! Decode answer message from a mDNS packet. - * - * Answer messages must consist of one header and one or more resource records. An additional question section or - * message compression (RFC 1035 4.1.4) are not supported. -* \returns allocated answer message on success, NULL on error. - */ -struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_header hdr = {}; - size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); - struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer); - - /* Parse header section */ - if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1) - goto error; - ret->id = hdr.id; - data_len -= hdr_len; - data += hdr_len; - - /* Parse resource records */ - INIT_LLIST_HEAD(&ret->records); - while (data_len) { - size_t record_len; - struct osmo_mdns_rfc_record *rec; - struct osmo_mdns_record* ret_record; - - rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len); - if (!rec) - goto error; - - /* Copy domain to ret */ - if (ret->domain) { - if (strcmp(ret->domain, rec->domain) != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n", - ret->domain, rec->domain); - goto error; - } - } - else - ret->domain = talloc_strdup(ret, rec->domain); - - /* Add simplified record to ret */ - ret_record = talloc_zero(ret, struct osmo_mdns_record); - ret_record->type = rec->type; - ret_record->length = rec->rdlength; - ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength); - llist_add_tail(&ret_record->list, &ret->records); - - data += record_len; - data_len -= record_len; - talloc_free(rec); - } - - /* Verify record count */ - if (llist_count(&ret->records) != hdr.ancount) { - LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n", - llist_count(&ret->records), hdr.ancount); - goto error; - } - - return ret; -error: - talloc_free(ret); - return NULL; -} - -/*! Get a TXT resource record, which stores a key=value string. - * \returns allocated resource record on success, NULL on error. - */ -static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value) -{ - struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record); - size_t len = strlen(key) + 1 + strlen(value); - - if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1) - return NULL; - - /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */ - ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value); - if (!ret->data) - return NULL; - ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT; - ret->length = len + 1; - return ret; -} - -/*! Get a TXT resource record, which stores a key=value string, but build value from a format string. - * \returns allocated resource record on success, NULL on error. - */ -struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...) -{ - va_list ap; - char *value = NULL; - struct osmo_mdns_record *r; - - if (!value_fmt) - return _osmo_mdns_record_txt_encode(ctx, key, ""); - - va_start(ap, value_fmt); - value = talloc_vasprintf(ctx, value_fmt, ap); - if (!value) - return NULL; - va_end(ap); - r = _osmo_mdns_record_txt_encode(ctx, key, value); - talloc_free(value); - return r; -} - -/*! Decode a TXT resource record, which stores a key=value string. - * \returns 0 on success, -EINVAL on error. - */ -int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, - char *key_buf, size_t key_size, char *value_buf, size_t value_size) -{ - const char *key_value; - const char *key_value_end; - const char *sep; - const char *value; - - if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT) - return -EINVAL; - - key_value = (const char *)rec->data; - key_value_end = key_value + rec->length; - - /* Verify and then skip the redundant string length byte */ - if (*key_value != rec->length - 1) - return -EINVAL; - key_value++; - - if (key_value >= key_value_end) - return -EINVAL; - - /* Find equals sign */ - sep = osmo_strnchr(key_value, key_value_end - key_value, '='); - if (!sep) - return -EINVAL; - - /* Parse key */ - osmo_print_n(key_buf, key_size, key_value, sep - key_value); - - /* Parse value */ - value = sep + 1; - osmo_print_n(value_buf, value_size, value, key_value_end - value); - return 0; -} diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c deleted file mode 100644 index e1fc184..0000000 --- a/src/mslookup/mdns_rfc.c +++ /dev/null @@ -1,265 +0,0 @@ -/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records, - * as described in these RFCs: - * - RFC 1035 (Domain names - implementation and specification) - * - RFC 3596 (DNS Extensions to Support IP Version 6) */ - -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include - -/* - * Encode/decode IEs - */ - -/*! Encode a domain string as qname (RFC 1035 4.1.2). - * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". - * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. - */ -char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) -{ - char *domain_dup; - char *domain_iter; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ - struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; - char *label; - - if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - domain_iter = domain_dup = talloc_strdup(ctx, domain); - while ((label = strsep(&domain_iter, "."))) { - size_t len = strlen(label); - - /* Empty domain, dot at start, two dots in a row, or ending with a dot */ - if (!len) - goto error; - - OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); - } - - talloc_free(domain_dup); - return talloc_strdup(ctx, buf); - -error: - talloc_free(domain_dup); - return NULL; -} - -/*! Decode a domain string from a qname (RFC 1035 4.1.2). - * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) - * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. - * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), - * NULL on error. - */ -char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) -{ - const char *next_label, *qname_end = qname + qname_max_len; - char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; - int i = 0; - - if (qname_max_len < 1) - return NULL; - - while (*qname) { - size_t len = *qname; - next_label = qname + len + 1; - - if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) - return NULL; - - if (i) { - /* Two dots in a row is not allowed */ - if (buf[i - 1] == '.') - return NULL; - - buf[i] = '.'; - i++; - } - - memcpy(buf + i, qname + 1, len); - i += len; - qname = next_label; - } - buf[i] = '\0'; - - return talloc_strdup(ctx, buf); -} - -/* - * Encode/decode message sections - */ - -/*! Encode header section (RFC 1035 4.1.1). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr) -{ - struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr)); - memcpy(buf, hdr, sizeof(*hdr)); - - osmo_store16be(buf->id, &buf->id); - osmo_store16be(buf->qdcount, &buf->qdcount); - osmo_store16be(buf->ancount, &buf->ancount); - osmo_store16be(buf->nscount, &buf->nscount); - osmo_store16be(buf->arcount, &buf->arcount); -} - -/*! Decode header section (RFC 1035 4.1.1). */ -int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr) -{ - if (data_len != sizeof(*hdr)) - return -EINVAL; - - memcpy(hdr, data, data_len); - - hdr->id = osmo_load16be(&hdr->id); - hdr->qdcount = osmo_load16be(&hdr->qdcount); - hdr->ancount = osmo_load16be(&hdr->ancount); - hdr->nscount = osmo_load16be(&hdr->nscount); - hdr->arcount = osmo_load16be(&hdr->arcount); - - return 0; -} - -/*! Encode question section (RFC 1035 4.1.2). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) -{ - char *qname; - size_t qname_len; - uint8_t *qname_buf; - - /* qname */ - qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); - if (!qname) - return -EINVAL; - qname_len = strlen(qname) + 1; - qname_buf = msgb_put(msg, qname_len); - memcpy(qname_buf, qname, qname_len); - talloc_free(qname); - - /* qtype and qclass */ - msgb_put_u16(msg, qst->qtype); - msgb_put_u16(msg, qst->qclass); - - return 0; -} - -/*! Decode question section (RFC 1035 4.1.2). */ -struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len) -{ - struct osmo_mdns_rfc_question *ret; - size_t qname_len = data_len - 4; - - if (data_len < 6) - return NULL; - - /* qname */ - ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); - if (!ret) - return NULL; - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); - if (!ret->domain) { - talloc_free(ret); - return NULL; - } - - /* qtype and qclass */ - ret->qtype = osmo_load16be(data + qname_len); - ret->qclass = osmo_load16be(data + qname_len + 2); - - return ret; -} - -/* - * Encode/decode resource records - */ - -/*! Encode one resource record (RFC 1035 4.1.3). - * \param[in] msgb mesage buffer to which the encoded data will be appended. - */ -int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) -{ - char *name; - size_t name_len; - uint8_t *buf; - - /* name */ - name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); - if (!name) - return -EINVAL; - name_len = strlen(name) + 1; - buf = msgb_put(msg, name_len); - memcpy(buf, name, name_len); - talloc_free(name); - - /* type, class, ttl, rdlength */ - msgb_put_u16(msg, rec->type); - msgb_put_u16(msg, rec->class); - msgb_put_u32(msg, rec->ttl); - msgb_put_u16(msg, rec->rdlength); - - /* rdata */ - buf = msgb_put(msg, rec->rdlength); - memcpy(buf, rec->rdata, rec->rdlength); - return 0; -} - -/*! Decode one resource record (RFC 1035 4.1.3). */ -struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, - size_t *record_len) -{ - struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); - size_t name_len; - - /* name */ - ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); - if (!ret->domain) - goto error; - name_len = strlen(ret->domain) + 2; - if (name_len + 10 > data_len) - goto error; - - /* type, class, ttl, rdlength */ - ret->type = osmo_load16be(data + name_len); - ret->class = osmo_load16be(data + name_len + 2); - ret->ttl = osmo_load32be(data + name_len + 4); - ret->rdlength = osmo_load16be(data + name_len + 8); - if (name_len + 10 + ret->rdlength > data_len) - goto error; - - /* rdata */ - ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength); - if (!ret->rdata) - return NULL; - - *record_len = name_len + 10 + ret->rdlength; - return ret; -error: - talloc_free(ret); - return NULL; -} - diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c deleted file mode 100644 index 5291660..0000000 --- a/src/mslookup/mdns_sock.c +++ /dev/null @@ -1,144 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/*! Open socket to send and receive multicast data. - * - * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives - * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever - * sending something, the receive callback will be called with the same data and should discard it. - * - * \param[in] ip multicast IPv4 or IPv6 address. - * \param[in] port port number. - * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd). - * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data). - * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr). - * \returns allocated osmo_mdns_sock, NULL on error. - */ -struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, - int (*cb)(struct osmo_fd *fd, unsigned int what), - void *data, unsigned int priv_nr) -{ - struct osmo_mdns_sock *ret; - int sock, rc; - struct addrinfo hints = {0}; - struct ip_mreq multicast_req = {0}; - in_addr_t iface = INADDR_ANY; - char portbuf[10]; - int y = 1; - - snprintf(portbuf, sizeof(portbuf) -1, "%u", port); - ret = talloc_zero(ctx, struct osmo_mdns_sock); - OSMO_ASSERT(ret); - - /* Fill addrinfo */ - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); - rc = getaddrinfo(ip, portbuf, &hints, &ret->ai); - if (rc != 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc)); - ret->ai = NULL; - goto error; - } - - /* Open socket */ - sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0); - if (sock == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno)); - goto error; - } - - /* Set multicast options */ - rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, - sizeof(multicast_req.imr_multiaddr)); - multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); - rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - - /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by - * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for - * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same - * time need to be resolved with the simple dialplan example that just starts new processes). */ - rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; - } - - /* Bind and register osmo_fd callback */ - rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); - if (rc == -1) { - LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); - goto error; - } - osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); - if (osmo_fd_register(&ret->osmo_fd) != 0) - goto error; - - return ret; -error: - if (ret->ai) - freeaddrinfo(ret->ai); - talloc_free(ret); - return NULL; -} - -/*! Send msgb over mdns_sock and consume msgb. - * \returns 0 on success, -1 on error. - */ -int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) -{ - size_t len = msgb_length(msg); - int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr, - mdns_sock->ai->ai_addrlen); - msgb_free(msg); - return (rc == len) ? 0 : -1; -} - -/*! Tear down osmo_mdns_sock. */ -void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock) -{ - osmo_fd_close(&mdns_sock->osmo_fd); - freeaddrinfo(mdns_sock->ai); - talloc_free(mdns_sock); -} diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c deleted file mode 100644 index 7ba3502..0000000 --- a/src/mslookup/mslookup_client_mdns.c +++ /dev/null @@ -1,235 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct osmo_mdns_method_state { - /* Parameters passed by _add_method_dns() */ - struct osmo_sockaddr_str bind_addr; - const char *domain_suffix; - - struct osmo_mdns_sock *mc; - - struct osmo_mslookup_client *client; - struct llist_head requests; - uint16_t next_packet_id; -}; - -struct osmo_mdns_method_request { - struct llist_head entry; - uint32_t request_handle; - struct osmo_mslookup_query query; - uint16_t packet_id; -}; - -static int request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state, - struct osmo_mslookup_query *query, uint16_t packet_id) -{ - struct osmo_mdns_method_request *request; - - llist_for_each_entry(request, &state->requests, entry) { - if (strcmp(request->query.service, query->service) != 0) - continue; - if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0) - continue; - - /* Match! */ - *request_handle = request->request_handle; - return 0; - } - return -1; -} - -static int mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what) -{ - struct osmo_mdns_method_state *state = osmo_fd->data; - struct osmo_mslookup_result result; - struct osmo_mslookup_query query; - uint16_t packet_id; - int n; - uint8_t buffer[1024]; - uint32_t request_handle = 0; - void *ctx = state; - - n = read(osmo_fd->fd, buffer, sizeof(buffer)); - if (n < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n"); - return n; - } - - if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0) - return -EINVAL; - - if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0) - return -EINVAL; - - osmo_mslookup_client_rx_result(state->client, request_handle, &result); - return n; -} - -static void mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query, - uint32_t request_handle) -{ - char buf[256]; - struct osmo_mdns_method_state *state = method->priv; - struct msgb *msg; - struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request); - - *r = (struct osmo_mdns_method_request){ - .request_handle = request_handle, - .query = *query, - .packet_id = state->next_packet_id, - }; - llist_add(&r->entry, &state->requests); - state->next_packet_id++; - - msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix); - if (!msg) { - LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", - osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); - } - - /* Send over the wire */ - LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service, - osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id)); - if (osmo_mdns_sock_send(state->mc, msg) == -1) - LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\n"); -} - -static void mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle) -{ - struct osmo_mdns_method_state *state = method->priv; - - /* Tear down any state associated with this handle. */ - struct osmo_mdns_method_request *r; - llist_for_each_entry(r, &state->requests, entry) { - if (r->request_handle != request_handle) - continue; - llist_del(&r->entry); - talloc_free(r); - return; - } -} - -static void mdns_method_destruct(struct osmo_mslookup_client_method *method) -{ - struct osmo_mdns_method_state *state = method->priv; - struct osmo_mdns_method_request *e, *n; - if (!state) - return; - - /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will - * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */ - llist_for_each_entry_safe(e, n, &state->requests, entry) { - llist_del(&e->entry); - } - - osmo_mdns_sock_cleanup(state->mc); -} - -/*! Initialize the mDNS lookup method. - * \param[in] client the client to attach the method to. - * \param[in] ip IPv4 or IPv6 address string. - * \param[in] port The port to bind to. - * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All - * servers answer to each query with the same packet ID. Set to -1 to use a random - * initial ID (recommended unless you need deterministic output). This ID is for visually - * distinguishing the packets in packet sniffers, the mslookup client uses not just the - * ID, but all query parameters (service type, ID, ID type), to determine if a reply is - * relevant. - * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains - * administrated by IANA. Example: "mdns.osmocom.org" */ -struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, - uint16_t port, int initial_packet_id, - const char *domain_suffix) -{ - struct osmo_mdns_method_state *state; - struct osmo_mslookup_client_method *m; - - m = talloc_zero(client, struct osmo_mslookup_client_method); - OSMO_ASSERT(m); - - state = talloc_zero(m, struct osmo_mdns_method_state); - OSMO_ASSERT(state); - INIT_LLIST_HEAD(&state->requests); - if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) { - LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n", - ip, port); - goto error_cleanup; - } - - if (initial_packet_id == -1) { - if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) { - LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n"); - goto error_cleanup; - } - } else - state->next_packet_id = initial_packet_id; - - state->client = client; - state->domain_suffix = domain_suffix; - - state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0); - if (!state->mc) - goto error_cleanup; - - *m = (struct osmo_mslookup_client_method){ - .name = "mDNS", - .priv = state, - .request = mdns_method_request, - .request_cleanup = mdns_method_request_cleanup, - .destruct = mdns_method_destruct, - }; - - osmo_mslookup_client_method_add(client, m); - return m; - -error_cleanup: - talloc_free(m); - return NULL; -} - -const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method) -{ - struct osmo_mdns_method_state *state; - if (!dns_method || !dns_method->priv) - return NULL; - state = dns_method->priv; - return &state->bind_addr; -} - -const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method) -{ - struct osmo_mdns_method_state *state; - if (!dns_method || !dns_method->priv) - return NULL; - state = dns_method->priv; - return state->domain_suffix; -} diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index ebf2add..71602a3 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -16,15 +16,11 @@ $(NULL) EXTRA_DIST = \ - mdns_test.err \ - mslookup_client_mdns_test.err \ mslookup_client_test.err \ mslookup_test.err \ $(NULL) check_PROGRAMS = \ - mdns_test \ - mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -45,22 +41,6 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -mslookup_client_mdns_test_SOURCES = \ - mslookup_client_mdns_test.c \ - $(NULL) -mslookup_client_mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -mdns_test_SOURCES = \ - mdns_test.c \ - $(NULL) -mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c deleted file mode 100644 index 8a60e85..0000000 --- a/tests/mslookup/mdns_test.c +++ /dev/null @@ -1,602 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -struct qname_enc_dec_test { - const char *domain; - const char *qname; - size_t qname_max_len; /* default: strlen(qname) + 1 */ -}; - -static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { - { - /* OK: typical mslookup domain */ - .domain = "hlr.1234567.imsi", - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: double dot */ - .domain = "hlr..imsi", - .qname = NULL, - }, - { - /* Wrong format: double dot */ - .domain = "hlr", - .qname = "\x03hlr\0\x03imsi", - }, - { - /* Wrong format: dot at end */ - .domain = "hlr.", - .qname = NULL, - }, - { - /* Wrong format: dot at start */ - .domain = ".hlr", - .qname = NULL, - }, - { - /* Wrong format: empty */ - .domain = "", - .qname = NULL, - }, - { - /* OK: maximum length */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345" - , - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\x05" "12345" - }, - { - /* Error: too long domain */ - .domain = - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "123456789." "123456789." "123456789." "123456789." "123456789." - "12345toolong" - , - .qname = NULL, - }, - { - /* Error: too long qname */ - .domain = NULL, - .qname = - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - "\t123456789\t123456789\t123456789\t123456789\t123456789" - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", - }, - { - /* Error: wrong token length in qname */ - .domain = NULL, - .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", - }, - { - /* Wrong format: token length at end of qname */ - .domain = NULL, - .qname = "\x03hlr\x03", - }, - { - /* Error: overflow in label length */ - .domain = NULL, - .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", - .qname_max_len = 17, - }, -}; - -void test_enc_dec_rfc_qname(void *ctx) -{ - char quote_buf[300]; - int i; - - fprintf(stderr, "-- %s --\n", __func__); - - for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { - const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; - char *res; - - if (t->domain) { - fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - res = osmo_mdns_rfc_qname_encode(ctx, t->domain); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - - if (t->qname) { - size_t qname_max_len = t->qname_max_len; - if (qname_max_len) - fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); - else - qname_max_len = strlen(t->qname) + 1; - - fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); - fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); - res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); - fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); - if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) - fprintf(stderr, "=> OK\n"); - else - fprintf(stderr, "=> ERROR\n"); - if (res) - talloc_free(res); - fprintf(stderr, "\n"); - } - } -} - -#define PRINT_HDR(hdr, name) \ - fprintf(stderr, "header %s:\n" \ - ".id = %i\n" \ - ".qr = %i\n" \ - ".opcode = %x\n" \ - ".aa = %i\n" \ - ".tc = %i\n" \ - ".rd = %i\n" \ - ".ra = %i\n" \ - ".z = %x\n" \ - ".rcode = %x\n" \ - ".qdcount = %u\n" \ - ".ancount = %u\n" \ - ".nscount = %u\n" \ - ".arcount = %u\n", \ - name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \ - hdr.ancount, hdr.nscount, hdr.arcount) - -static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = { - { - /* Typical use case for mslookup */ - .id = 1337, - .qdcount = 1, - }, - { - /* Fill out everything */ - .id = 42, - .qr = 1, - .opcode = 0x02, - .aa = 1, - .tc = 1, - .rd = 1, - .ra = 1, - .z = 0x02, - .rcode = 0x03, - .qdcount = 1234, - .ancount = 1111, - .nscount = 2222, - .arcount = 3333, - }, -}; - -void test_enc_dec_rfc_header() -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i]; - struct osmo_mdns_rfc_header out = {0}; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - - PRINT_HDR(in, "in"); - osmo_mdns_rfc_header_encode(msg, &in); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0); - PRINT_HDR(out, "out"); - - fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in))); - fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out))); - assert(memcmp(&in, &out, sizeof(in)) == 0); - - fprintf(stderr, "=> OK\n\n"); - msgb_free(msg); - } -} - -void test_enc_dec_rfc_header_einval() -{ - struct osmo_mdns_rfc_header out = {0}; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - fprintf(stderr, "-- %s --\n", __func__); - - assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL); - fprintf(stderr, "=> OK\n\n"); - - msgb_free(msg); -} - -#define PRINT_QST(qst, name) \ - fprintf(stderr, "question %s:\n" \ - ".domain = %s\n" \ - ".qtype = %i\n" \ - ".qclass = %i\n", \ - name, (qst)->domain, (qst)->qtype, (qst)->qclass) - -static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = { - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL, - .qclass = OSMO_MDNS_RFC_CLASS_IN, - }, - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A, - .qclass = OSMO_MDNS_RFC_CLASS_ALL, - }, - { - .domain = "hlr.1234567.imsi", - .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA, - .qclass = OSMO_MDNS_RFC_CLASS_ALL, - }, -}; - -void test_enc_dec_rfc_question(void *ctx) -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i]; - struct osmo_mdns_rfc_question *out; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - - PRINT_QST(&in, "in"); - assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); - assert(out); - PRINT_QST(out, "out"); - - if (strcmp(in.domain, out->domain) != 0) - fprintf(stderr, "=> ERROR: domain does not match\n"); - else if (in.qtype != out->qtype) - fprintf(stderr, "=> ERROR: qtype does not match\n"); - else if (in.qclass != out->qclass) - fprintf(stderr, "=> ERROR: qclass does not match\n"); - else - fprintf(stderr, "=> OK\n"); - - fprintf(stderr, "\n"); - msgb_free(msg); - talloc_free(out); - } -} - -void test_enc_dec_rfc_question_null(void *ctx) -{ - uint8_t data[5] = {0}; - - fprintf(stderr, "-- %s --\n", __func__); - assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL); - fprintf(stderr, "=> OK\n\n"); -} - -#define PRINT_REC(rec, name) \ - fprintf(stderr, "question %s:\n" \ - ".domain = %s\n" \ - ".type = %i\n" \ - ".class = %i\n" \ - ".ttl = %i\n" \ - ".rdlength = %i\n" \ - ".rdata = %s\n", \ - name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \ - osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength)) - -static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = { - { - .domain = "hlr.1234567.imsi", - .type = OSMO_MDNS_RFC_RECORD_TYPE_A, - .class = OSMO_MDNS_RFC_CLASS_IN, - .ttl = 1234, - .rdlength = 9, - .rdata = (uint8_t *)"10.42.2.1", - }, -}; - -void test_enc_dec_rfc_record(void *ctx) -{ - int i; - - fprintf(stderr, "-- %s --\n", __func__); - for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) { - const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i]; - struct osmo_mdns_rfc_record *out; - struct msgb *msg = msgb_alloc(4096, "dns_test"); - size_t record_len; - - PRINT_REC(&in, "in"); - assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); - fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); - fprintf(stderr, "record_len: %lu\n", record_len); - assert(out); - PRINT_REC(out, "out"); - - if (strcmp(in.domain, out->domain) != 0) - fprintf(stderr, "=> ERROR: domain does not match\n"); - else if (in.type != out->type) - fprintf(stderr, "=> ERROR: type does not match\n"); - else if (in.class != out->class) - fprintf(stderr, "=> ERROR: class does not match\n"); - else if (in.ttl != out->ttl) - fprintf(stderr, "=> ERROR: ttl does not match\n"); - else if (in.rdlength != out->rdlength) - fprintf(stderr, "=> ERROR: rdlength does not match\n"); - else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0) - fprintf(stderr, "=> ERROR: rdata does not match\n"); - else - fprintf(stderr, "=> OK\n"); - - fprintf(stderr, "\n"); - msgb_free(msg); - talloc_free(out); - } -} - -static uint8_t ip_v4_n[] = {23, 42, 47, 11}; -static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, - 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}; - - -enum test_records { - RECORD_NONE, - RECORD_A, - RECORD_AAAA, - RECORD_TXT_AGE, - RECORD_TXT_PORT_444, - RECORD_TXT_PORT_666, - RECORD_TXT_INVALID_KEY, - RECORD_TXT_INVALID_NO_KEY_VALUE, - RECORD_INVALID, -}; -struct result_from_answer_test { - const char *desc; - const enum test_records records[5]; - bool error; - const struct osmo_mslookup_result res; -}; - -static void test_result_from_answer(void *ctx) -{ - void *print_ctx = talloc_named_const(ctx, 0, __func__); - struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"}; - struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666, - .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"}; - struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v4 = test_host_v4}; - struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v6 = test_host_v6}; - struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, - .host_v4 = test_host_v4, .host_v6 = test_host_v6}; - struct result_from_answer_test result_from_answer_data[] = { - { - .desc = "IPv4", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444}, - .res = test_result_v4 - }, - { - .desc = "IPv6", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666}, - .res = test_result_v6 - }, - { - .desc = "IPv4 + IPv6", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666}, - .res = test_result_v4_v6 - }, - { - .desc = "A twice", - .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A}, - .error = true - }, - { - .desc = "AAAA twice", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA}, - .error = true - }, - { - .desc = "invalid TXT: no key/value pair", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE}, - .error = true - }, - { - .desc = "age twice", - .records = {RECORD_TXT_AGE, RECORD_TXT_AGE}, - .error = true - }, - { - .desc = "port as first record", - .records = {RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "port without previous ip record", - .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "invalid TXT: invalid key", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY}, - .error = true - }, - { - .desc = "unexpected record type", - .records = {RECORD_TXT_AGE, RECORD_INVALID}, - .error = true - }, - { - .desc = "missing record: age", - .records = {RECORD_A, RECORD_TXT_PORT_444}, - .error = true - }, - { - .desc = "missing record: port for ipv4", - .records = {RECORD_TXT_AGE, RECORD_A}, - .error = true - }, - { - .desc = "missing record: port for ipv4 #2", - .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A}, - .error = true - }, - }; - int i = 0; - int j = 0; - - fprintf(stderr, "-- %s --\n", __func__); - for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) { - struct result_from_answer_test *t = &result_from_answer_data[i]; - struct osmo_mdns_msg_answer ans = {0}; - struct osmo_mslookup_result res = {0}; - void *ctx_test = talloc_named_const(ctx, 0, t->desc); - bool is_error; - - fprintf(stderr, "---\n"); - fprintf(stderr, "test: %s\n", t->desc); - fprintf(stderr, "error: %s\n", t->error ? "true" : "false"); - fprintf(stderr, "records:\n"); - /* Build records list */ - INIT_LLIST_HEAD(&ans.records); - for (j = 0; j < ARRAY_SIZE(t->records); j++) { - struct osmo_mdns_record *rec = NULL; - - switch (t->records[j]) { - case RECORD_NONE: - break; - case RECORD_A: - fprintf(stderr, "- A 42.42.42.42\n"); - rec = talloc_zero(ctx_test, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A; - rec->data = ip_v4_n; - rec->length = sizeof(ip_v4_n); - break; - case RECORD_AAAA: - fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n"); - rec = talloc_zero(ctx_test, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; - rec->data = ip_v6_n; - rec->length = sizeof(ip_v6_n); - break; - case RECORD_TXT_AGE: - fprintf(stderr, "- TXT age=3\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3"); - break; - case RECORD_TXT_PORT_444: - fprintf(stderr, "- TXT port=444\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444"); - break; - case RECORD_TXT_PORT_666: - fprintf(stderr, "- TXT port=666\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666"); - break; - case RECORD_TXT_INVALID_KEY: - fprintf(stderr, "- TXT hello=world\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world"); - break; - case RECORD_TXT_INVALID_NO_KEY_VALUE: - fprintf(stderr, "- TXT 12345\n"); - rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45"); - rec->data[3] = '3'; - break; - case RECORD_INVALID: - fprintf(stderr, "- (invalid)\n"); - rec = talloc_zero(ctx, struct osmo_mdns_record); - rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN; - break; - } - - if (rec) - llist_add_tail(&rec->list, &ans.records); - } - - /* Verify output */ - is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0); - if (t->error != is_error) { - fprintf(stderr, "got %s\n", is_error ? "error" : "no error"); - OSMO_ASSERT(false); - } - if (!t->error) { - fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res)); - fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res)); - OSMO_ASSERT(t->res.rc == res.rc); - OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4)); - OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6)); - OSMO_ASSERT(t->res.age == res.age); - OSMO_ASSERT(t->res.last == res.last); - } - - talloc_free(ctx_test); - fprintf(stderr, "=> OK\n"); - } -} - -int main() -{ - void *ctx = talloc_named_const(NULL, 0, "main"); - osmo_init_logging2(ctx, NULL); - - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_level(osmo_stderr_target, 1); - log_set_print_category(osmo_stderr_target, 1); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_use_color(osmo_stderr_target, 0); - - test_enc_dec_rfc_qname(ctx); - test_enc_dec_rfc_header(); - test_enc_dec_rfc_header_einval(); - test_enc_dec_rfc_question(ctx); - test_enc_dec_rfc_question_null(ctx); - test_enc_dec_rfc_record(ctx); - - test_result_from_answer(ctx); - - return 0; -} diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err deleted file mode 100644 index 51e5afe..0000000 --- a/tests/mslookup/mdns_test.err +++ /dev/null @@ -1,336 +0,0 @@ --- test_enc_dec_rfc_qname -- -domain: "hlr.1234567.imsi" -exp: "\3hlr\a1234567\4imsi" -res: "\3hlr\a1234567\4imsi" -=> OK - -qname: "\3hlr\a1234567\4imsi" -exp: "hlr.1234567.imsi" -res: "hlr.1234567.imsi" -=> OK - -domain: "hlr..imsi" -exp: NULL -res: NULL -=> OK - -domain: "hlr" -exp: "\3hlr" -res: "\3hlr" -=> OK - -qname: "\3hlr" -exp: "hlr" -res: "hlr" -=> OK - -domain: "hlr." -exp: NULL -res: NULL -=> OK - -domain: ".hlr" -exp: NULL -res: NULL -=> OK - -domain: "" -exp: NULL -res: NULL -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" -exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" -=> OK - -domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" -exp: NULL -res: NULL -=> OK - -qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\a1234567\5imsi" -exp: NULL -res: NULL -=> OK - -qname: "\2hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - -qname: "\3hlr\3" -exp: NULL -res: NULL -=> OK - -qname_max_len: 17 -qname: "\3hlr\a1234567\4imsi" -exp: NULL -res: NULL -=> OK - --- test_enc_dec_rfc_header -- -header in: -.id = 1337 -.qr = 0 -.opcode = 0 -.aa = 0 -.tc = 0 -.rd = 0 -.ra = 0 -.z = 0 -.rcode = 0 -.qdcount = 1 -.ancount = 0 -.nscount = 0 -.arcount = 0 -encoded: 05 39 00 00 00 01 00 00 00 00 00 00 -header out: -.id = 1337 -.qr = 0 -.opcode = 0 -.aa = 0 -.tc = 0 -.rd = 0 -.ra = 0 -.z = 0 -.rcode = 0 -.qdcount = 1 -.ancount = 0 -.nscount = 0 -.arcount = 0 -in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 -out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 -=> OK - -header in: -.id = 42 -.qr = 1 -.opcode = 2 -.aa = 1 -.tc = 1 -.rd = 1 -.ra = 1 -.z = 2 -.rcode = 3 -.qdcount = 1234 -.ancount = 1111 -.nscount = 2222 -.arcount = 3333 -encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 -header out: -.id = 42 -.qr = 1 -.opcode = 2 -.aa = 1 -.tc = 1 -.rd = 1 -.ra = 1 -.z = 2 -.rcode = 3 -.qdcount = 1234 -.ancount = 1111 -.nscount = 2222 -.arcount = 3333 -in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d -out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d -=> OK - --- test_enc_dec_rfc_header_einval -- -=> OK - --- test_enc_dec_rfc_question -- -question in: -.domain = hlr.1234567.imsi -.qtype = 255 -.qclass = 1 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 -question out: -.domain = hlr.1234567.imsi -.qtype = 255 -.qclass = 1 -=> OK - -question in: -.domain = hlr.1234567.imsi -.qtype = 1 -.qclass = 255 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff -question out: -.domain = hlr.1234567.imsi -.qtype = 1 -.qclass = 255 -=> OK - -question in: -.domain = hlr.1234567.imsi -.qtype = 28 -.qclass = 255 -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff -question out: -.domain = hlr.1234567.imsi -.qtype = 28 -.qclass = 255 -=> OK - --- test_enc_dec_rfc_question_null -- -=> OK - --- test_enc_dec_rfc_record -- -question in: -.domain = hlr.1234567.imsi -.type = 1 -.class = 1 -.ttl = 1234 -.rdlength = 9 -.rdata = "10.42.2.1" -encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 -record_len: 37 -question out: -.domain = hlr.1234567.imsi -.type = 1 -.class = 1 -.ttl = 1234 -.rdlength = 9 -.rdata = "10.42.2.1" -=> OK - --- test_result_from_answer -- ---- -test: IPv4 -error: false -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last) -res: -> ipv4: 23.42.47.11:444 (age=3) (not-last) -=> OK ---- -test: IPv6 -error: false -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -=> OK ---- -test: IPv4 + IPv6 -error: false -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -=> OK ---- -test: A twice -error: true -records: -- TXT age=3 -- A 42.42.42.42 -- TXT port=444 -- A 42.42.42.42 -DLGLOBAL ERROR 'A' record found twice in mDNS answer -=> OK ---- -test: AAAA twice -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=444 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer -=> OK ---- -test: invalid TXT: no key/value pair -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT 12345 -DLGLOBAL ERROR failed to decode txt record -=> OK ---- -test: age twice -error: true -records: -- TXT age=3 -- TXT age=3 -DLGLOBAL ERROR duplicate 'TXT' record for 'age' -=> OK ---- -test: port as first record -error: true -records: -- TXT port=444 -DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record -=> OK ---- -test: port without previous ip record -error: true -records: -- TXT age=3 -- TXT port=444 -DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record -=> OK ---- -test: invalid TXT: invalid key -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT hello=world -DLGLOBAL ERROR unexpected key 'hello' in TXT record -=> OK ---- -test: unexpected record type -error: true -records: -- TXT age=3 -- (invalid) -DLGLOBAL ERROR unexpected record type -=> OK ---- -test: missing record: age -error: true -records: -- A 42.42.42.42 -- TXT port=444 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK ---- -test: missing record: port for ipv4 -error: true -records: -- TXT age=3 -- A 42.42.42.42 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK ---- -test: missing record: port for ipv4 #2 -error: true -records: -- TXT age=3 -- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 -- TXT port=666 -- A 42.42.42.42 -DLGLOBAL ERROR missing resource records in mDNS answer -=> OK diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c deleted file mode 100644 index 6091e3c..0000000 --- a/tests/mslookup/mslookup_client_mdns_test.c +++ /dev/null @@ -1,220 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void *ctx = NULL; - -#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4 -#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT -#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org" - -/* - * Test server (emulates the mDNS server in OsmoHLR) and client - */ -struct osmo_mdns_sock *server_mc; - - -static void server_reply(struct osmo_mslookup_query *query, uint16_t packet_id) -{ - struct osmo_mslookup_result result = {0}; - struct msgb *msg; - - result.rc = OSMO_MSLOOKUP_RC_RESULT; - result.age = 3; - osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444); - osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666); - - msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX); - OSMO_ASSERT(msg); - OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 0); -} - -static int server_recv(struct osmo_fd *osmo_fd, unsigned int what) -{ - int n; - uint8_t buffer[1024]; - uint16_t packet_id; - struct osmo_mslookup_query *query; - - fprintf(stderr, "%s\n", __func__); - - /* Parse the message and print it */ - n = read(osmo_fd->fd, buffer, sizeof(buffer)); - OSMO_ASSERT(n >= 0); - - query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX); - if (!query) - return -1; /* server receiving own answer is expected */ - - fprintf(stderr, "received request\n"); - server_reply(query, packet_id); - talloc_free(query); - return n; -} - -static void server_init() -{ - fprintf(stderr, "%s\n", __func__); - server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0); - OSMO_ASSERT(server_mc); -} - -static void server_stop() -{ - fprintf(stderr, "%s\n", __func__); - OSMO_ASSERT(server_mc); - osmo_mdns_sock_cleanup(server_mc); - server_mc = NULL; -} - -struct osmo_mslookup_client* client; -struct osmo_mslookup_client_method* client_method; - -static void client_init() -{ - fprintf(stderr, "%s\n", __func__); - client = osmo_mslookup_client_new(ctx); - OSMO_ASSERT(client); - client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX); - OSMO_ASSERT(client_method); -} - -static void client_recv(struct osmo_mslookup_client *client, uint32_t request_handle, - const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result) -{ - char buf[256]; - fprintf(stderr, "%s\n", __func__); - fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); - - osmo_mslookup_client_request_cancel(client, request_handle); -} - -static void client_query() -{ - struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI, - .imsi = "123456789012345"}; - const struct osmo_mslookup_query query = { - .service = "gsup.hlr", - .id = id, - }; - struct osmo_mslookup_query_handling handling = { - .result_timeout_milliseconds = 2000, - .result_cb = client_recv, - }; - - fprintf(stderr, "%s\n", __func__); - osmo_mslookup_client_request(client, &query, &handling); -} - -static void client_stop() -{ - fprintf(stderr, "%s\n", __func__); - osmo_mslookup_client_free(client); - client = NULL; -} -const struct timeval fake_time_start_time = { 0, 0 }; - -#define fake_time_passes(secs, usecs) do \ -{ \ - struct timeval diff; \ - osmo_gettimeofday_override_add(secs, usecs); \ - osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ - timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ - LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ - (int)diff.tv_sec, (int)diff.tv_usec); \ - osmo_timers_prepare(); \ - osmo_timers_update(); \ -} while (0) - -static void fake_time_start() -{ - struct timespec *clock_override; - - osmo_gettimeofday_override_time = fake_time_start_time; - osmo_gettimeofday_override = true; - clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); - OSMO_ASSERT(clock_override); - clock_override->tv_sec = fake_time_start_time.tv_sec; - clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; - osmo_clock_override_enable(CLOCK_MONOTONIC, true); - fake_time_passes(0, 0); -} -static void test_server_client() -{ - fprintf(stderr, "-- %s --\n", __func__); - server_init(); - client_init(); - client_query(); - - /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and - * port, the client will also receive its own question. The client will dismiss its own question, as it is just - * looking for answers. */ - OSMO_ASSERT(osmo_select_main_ctx(1) == 1); - - /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback - * (client_recv()) just yet, because it is waiting for the best result within two seconds. */ - OSMO_ASSERT(osmo_select_main_ctx(1) == 1); - - /* Time flies by, client_recv() gets called. */ - fake_time_passes(5, 0); - - server_stop(); - client_stop(); -} - -/* - * Run all tests - */ -int main() -{ - talloc_enable_null_tracking(); - ctx = talloc_named_const(NULL, 0, "main"); - osmo_init_logging2(ctx, NULL); - - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_level(osmo_stderr_target, 0); - log_set_print_category(osmo_stderr_target, 0); - log_set_print_category_hex(osmo_stderr_target, 0); - log_set_use_color(osmo_stderr_target, 0); - log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); - - fake_time_start(); - - test_server_client(); - - log_fini(); - - OSMO_ASSERT(talloc_total_blocks(ctx) == 1); - talloc_free(ctx); - OSMO_ASSERT(talloc_total_blocks(NULL) == 1); - talloc_disable_null_tracking(); - - return 0; -} diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err deleted file mode 100644 index b4ea269..0000000 --- a/tests/mslookup/mslookup_client_mdns_test.err +++ /dev/null @@ -1,14 +0,0 @@ -Total time passed: 0.000000 s --- test_server_client -- -server_init -client_init -client_query -sending mDNS query: gsup.hlr.123456789012345.imsi -server_recv -received request -server_recv -client_recv -client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) -Total time passed: 5.000000 s -server_stop -client_stop diff --git a/tests/testsuite.at b/tests/testsuite.at index 827e9f8..39df7aa 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -40,12 +40,6 @@ AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([mdns]) -AT_KEYWORDS([mdns]) -cat $abs_srcdir/mslookup/mdns_test.err > experr -AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr]) -AT_CLEANUP - AT_SETUP([mslookup]) AT_KEYWORDS([mslookup]) cat $abs_srcdir/mslookup/mslookup_test.err > experr @@ -57,9 +51,3 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP - -AT_SETUP([mslookup_client_mdns]) -AT_KEYWORDS([mslookup_client_mdns]) -cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr -AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) -AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5aec5b59f304c7f732c4a31131beedf29c966d9d Gerrit-Change-Number: 16828 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 16:16:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 12 Jan 2020 16:16:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 ) Change subject: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 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: Iaa7347e973ee617cc1780b84e0c298f0a302227c Gerrit-Change-Number: 16801 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 16:16:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 16:18:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 12 Jan 2020 16:18:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add test TC_gsup_sai_err_unknown_imsi_configurable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16809 ) Change subject: hlr: add test TC_gsup_sai_err_unknown_imsi_configurable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16809 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: I1d3fa75c100f9d026ece8314bb7a70e905f1a3ef Gerrit-Change-Number: 16809 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jan 2020 16:18:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 12 16:31:07 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 12 Jan 2020 16:31:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e1b49ec3badf_12e32ae013cea5f415585fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 375s] | #define STDC_HEADERS 1 [ 375s] | #define HAVE_SYS_TYPES_H 1 [ 375s] | #define HAVE_SYS_STAT_H 1 [ 375s] | #define HAVE_STDLIB_H 1 [ 375s] | #define HAVE_STRING_H 1 [ 375s] | #define HAVE_MEMORY_H 1 [ 375s] | #define HAVE_STRINGS_H 1 [ 375s] | #define HAVE_INTTYPES_H 1 [ 375s] | #define HAVE_STDINT_H 1 [ 375s] | #define HAVE_UNISTD_H 1 [ 375s] | #define HAVE_DLFCN_H 1 [ 375s] | #define LT_OBJDIR ".libs/" [ 375s] | #define PACKAGE "osmo-hlr" [ 375s] | #define VERSION "1.2.0.4-637b" [ 375s] | #define STDC_HEADERS 1 [ 375s] | [ 375s] | configure: exit 0 [ 375s] [ 375s] make[1]: *** [debian/rules:17: override_dh_auto_test] Error 1 [ 375s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 375s] make: *** [debian/rules:7: build] Error 2 [ 375s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 375s] [ 375s] lamb68 failed "build osmo-hlr_1.2.0.4.637b.dsc" at Sun Jan 12 16:30:53 UTC 2020. [ 375s] [ 375s] ### VM INTERACTION START ### [ 378s] [ 361.807173] sysrq: SysRq : Power Off [ 378s] [ 361.814730] reboot: Power down [ 379s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 12 18:43:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 18:43:46 +0000 Subject: Change in osmo-remsim[master]: require minimum version 1.3.0 of libosmocore References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16829 ) Change subject: require minimum version 1.3.0 of libosmocore ...................................................................... require minimum version 1.3.0 of libosmocore Finally, a libosmocore version with per-thread select loop fd sets has been released, so we can update our version requirement here. Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Closes: OS#4250 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/29/16829/1 diff --git a/configure.ac b/configure.ac index d041c1a..31af887 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_CHECK_LIB(csv, csv_init, LIBS="$LIBS -lcsv", [AC_MSG_ERROR([*** libcsv library not found!])]) AC_CHECK_HEADERS([csv.h]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Gerrit-Change-Number: 16829 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 18:44:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 18:44:58 +0000 Subject: Change in osmo-remsim[master]: require minimum version 1.3.0 of libosmocore In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-remsim/+/16829 ) Change subject: require minimum version 1.3.0 of libosmocore ...................................................................... require minimum version 1.3.0 of libosmocore Finally, a libosmocore version with per-thread select loop fd sets has been released, so we can update our version requirement here. Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Closes: OS#4250 --- M configure.ac M debian/control 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/29/16829/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Gerrit-Change-Number: 16829 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 12 21:52:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jan 2020 21:52:20 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_matching_dev_{path, serial} References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16830 ) Change subject: usb: Add osmo_libusb_find_matching_dev_{path,serial} ...................................................................... usb: Add osmo_libusb_find_matching_dev_{path,serial} Thise two helper functions allow the user application to find a unique match among the existing USB devices, using either a user- provided iSerial string, or a user-provided physical USB path. Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93 --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 154 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/16830/1 diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h index 382c86e..2220e03 100644 --- a/include/osmocom/usb/libusb.h +++ b/include/osmocom/usb/libusb.h @@ -62,6 +62,14 @@ libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, const struct dev_id *dev_ids); +libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *path); + +libusb_device *osmo_libusb_find_matching_dev_serial(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *serial); + int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, struct usb_interface_match *out, unsigned int out_len); diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index b10f5be..9ad6240 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -220,6 +220,152 @@ return out; } +/*! Find a USB device of matching VendorID/ProductID at given path. + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples + * \param[in] path string representation of USB path + * \returns libusb_device if there was exactly one match; NULL otherwise */ +libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *path) +{ + libusb_device **list; + libusb_device *match = NULL; + unsigned int i; + int rc; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) + return NULL; + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + char pathbuf[128]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "couldn't get device descriptor\n"); + continue; + } + + /* check if device doesn't match */ + if (!match_dev_ids(&dev_desc, dev_ids)) + continue; + + /* check if path doesn't match */ + if (path) { + osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), dev); + if (strcmp(pathbuf, path)) + continue; + } + + if (match) { + /* we already have a match, but now found a second -> FAIL */ + libusb_free_device_list(list, 1); + LOGP(DLUSB, LOGL_ERROR, "Found more than one matching USB device\n"); + return NULL; + } else + match = dev; + } + + if (!match) { + /* no match: free the list with automatic unref of all devices */ + libusb_free_device_list(list, 1); + return NULL; + } + + /* unref all devices *except* the match we found */ + for (i = 0; list[i] != NULL; i++) { + libusb_device *dev = list[i]; + if (dev != match) + libusb_unref_device(dev); + } + /* free the list *without* automatic unref of all devices */ + libusb_free_device_list(list, 0); + return match; +} + +/*! Find a USB device of matching VendorID/ProductID and given iSerial string. + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples + * \param[in] serial string representation of serial number + * \returns libusb_device if there was exactly one match; NULL otherwise */ +libusb_device *osmo_libusb_find_matching_dev_serial(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *serial) +{ + libusb_device **list; + libusb_device *match = NULL; + unsigned int i; + int rc; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) + return NULL; + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "couldn't get device descriptor\n"); + continue; + } + + /* check if device doesn't match */ + if (!match_dev_ids(&dev_desc, dev_ids)) + continue; + + /* check if serial number string doesn't match */ + if (serial) { + char strbuf[256]; + libusb_device_handle *devh; + rc = libusb_open(dev, &devh); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "Cannot open USB Device: %s\n", + libusb_strerror(rc)); + /* there's no point in continuing here, as we don't know if there + * are multiple matches if we cannot read the iSerial string of all + * devices with matching vid/pid */ + libusb_free_device_list(list, 1); + return NULL; + } + rc = libusb_get_string_descriptor_ascii(devh, dev_desc.iSerialNumber, + (uint8_t *) strbuf, sizeof(strbuf)); + libusb_close(devh); + if (strcmp(strbuf, serial)) + continue; + } + + if (match) { + /* we already have a match, but now found a second -> FAIL */ + libusb_free_device_list(list, 1); + LOGP(DLUSB, LOGL_ERROR, "Found more than one matching USB device\n"); + return NULL; + } else + match = dev; + } + + if (!match) { + /* no match: free the list with automatic unref of all devices */ + libusb_free_device_list(list, 1); + return NULL; + } + + /* unref all devices *except* the match we found */ + for (i = 0; list[i] != NULL; i++) { + libusb_device *dev = list[i]; + if (dev != match) + libusb_unref_device(dev); + } + /* free the list *without* automatic unref of all devices */ + libusb_free_device_list(list, 0); + return match; +} + + /*! find a matching interface among all interfaces of the given USB device. * \param[in] dev USB device in which we shall search * \param[in] class USB Interface Class to look for -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93 Gerrit-Change-Number: 16830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 13 02:01:51 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:01:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5e1bcfa7ba7bc_12e32ae013cea5f41667118@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 403s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 403s] make[5]: Nothing to be done for 'install-exec-am'. [ 403s] make[5]: Nothing to be done for 'install-data-am'. [ 403s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 403s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 403s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 403s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 403s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 403s] make[4]: Nothing to be done for 'install-exec-am'. [ 403s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 403s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 403s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] dh_install [ 403s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 403s] [ 403s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 403s] dh_install: missing files, aborting [ 403s] make: *** [debian/rules:7: binary] Error 25 [ 403s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 403s] [ 403s] build36 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:01:34 UTC 2020. [ 403s] [ 403s] ### VM INTERACTION START ### [ 406s] [ 389.927523] sysrq: SysRq : Power Off [ 406s] [ 389.954684] reboot: Power down [ 406s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:03:00 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:03:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5e1bcfe3ec442_12e32ae013cea5f4166736c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 277s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 277s] make[5]: Nothing to be done for 'install-exec-am'. [ 277s] make[5]: Nothing to be done for 'install-data-am'. [ 277s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 277s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 277s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 277s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 277s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 277s] make[4]: Nothing to be done for 'install-exec-am'. [ 277s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 277s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 277s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 277s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 277s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 277s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 277s] dh_install [ 277s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") [ 277s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 277s] dh_install: missing files, aborting [ 277s] debian/rules:7: recipe for target 'binary' failed [ 277s] make: *** [binary] Error 255 [ 277s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 277s] [ 277s] build32 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:02:53 UTC 2020. [ 277s] [ 277s] ### VM INTERACTION START ### [ 280s] [ 264.206222] sysrq: SysRq : Power Off [ 280s] [ 264.218517] reboot: Power down [ 280s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:04:08 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:04:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5e1bd0215830d_12e32ae013cea5f41667525@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 538s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 538s] make[5]: Nothing to be done for 'install-exec-am'. [ 538s] make[5]: Nothing to be done for 'install-data-am'. [ 538s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 538s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 538s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 538s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 538s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 538s] make[4]: Nothing to be done for 'install-exec-am'. [ 538s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 538s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 538s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 538s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 538s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 538s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 538s] dh_install [ 538s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 538s] [ 538s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 538s] dh_install: missing files, aborting [ 538s] make: *** [debian/rules:7: binary] Error 25 [ 538s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 538s] [ 538s] lamb53 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:03:53 UTC 2020. [ 538s] [ 538s] ### VM INTERACTION START ### [ 541s] [ 508.968557] sysrq: SysRq : Power Off [ 541s] [ 508.974543] reboot: Power down [ 541s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:05:17 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:05:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5e1bd07b12202_12e32ae013cea5f416677b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 503s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 503s] make[5]: Nothing to be done for 'install-exec-am'. [ 503s] make[5]: Nothing to be done for 'install-data-am'. [ 503s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 503s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 503s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 503s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 503s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 503s] make[4]: Nothing to be done for 'install-exec-am'. [ 503s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 503s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 503s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 503s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 503s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 503s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 503s] dh_install [ 503s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") [ 503s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 503s] dh_install: missing files, aborting [ 503s] debian/rules:7: recipe for target 'binary' failed [ 503s] make: *** [binary] Error 255 [ 503s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 504s] [ 504s] lamb55 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:04:56 UTC 2020. [ 504s] [ 504s] ### VM INTERACTION START ### [ 507s] [ 487.861030] sysrq: SysRq : Power Off [ 507s] [ 487.886525] reboot: Power down [ 507s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:07:17 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:07:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5e1bd0efbe5d0_12e32ae013cea5f416680bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 515s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 515s] make[5]: Nothing to be done for 'install-exec-am'. [ 515s] make[5]: Nothing to be done for 'install-data-am'. [ 515s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 515s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 515s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 515s] make[4]: Nothing to be done for 'install-exec-am'. [ 515s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 515s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_install [ 515s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 515s] [ 515s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 515s] dh_install: missing files, aborting [ 515s] make: *** [debian/rules:7: binary] Error 25 [ 515s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 515s] [ 515s] cloud118 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:06:57 UTC 2020. [ 515s] [ 515s] ### VM INTERACTION START ### [ 518s] [ 490.536898] sysrq: SysRq : Power Off [ 518s] [ 490.554116] reboot: Power down [ 518s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:12:08 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:12:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5e1bd200a4203_12e32ae013cea5f4166912d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1004s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 1004s] make[5]: Nothing to be done for 'install-exec-am'. [ 1004s] make[5]: Nothing to be done for 'install-data-am'. [ 1004s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1004s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1004s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1004s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 1004s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 1004s] make[4]: Nothing to be done for 'install-exec-am'. [ 1004s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1004s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1004s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 1004s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1004s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1004s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1004s] dh_install [ 1004s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 1004s] [ 1004s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 1004s] dh_install: missing files, aborting [ 1004s] make: *** [debian/rules:7: binary] Error 25 [ 1004s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1004s] [ 1004s] lamb60 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:11:49 UTC 2020. [ 1004s] [ 1004s] ### VM INTERACTION START ### [ 1008s] [ 931.880489] sysrq: SysRq : Power Off [ 1008s] [ 931.933727] reboot: Power down [ 1008s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:13:00 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:13:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5e1bd23a863ee_12e32ae013cea5f41669336@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 363s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 363s] make[5]: Nothing to be done for 'install-exec-am'. [ 363s] make[5]: Nothing to be done for 'install-data-am'. [ 363s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 363s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 363s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 363s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 363s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 363s] make[4]: Nothing to be done for 'install-exec-am'. [ 363s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 363s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 363s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 363s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 363s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 363s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 363s] dh_install [ 363s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 363s] [ 363s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 363s] dh_install: missing files, aborting [ 363s] make: *** [debian/rules:7: binary] Error 25 [ 363s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 363s] [ 363s] build78 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:12:56 UTC 2020. [ 363s] [ 363s] ### VM INTERACTION START ### [ 366s] [ 351.108563] sysrq: SysRq : Power Off [ 366s] [ 351.110725] reboot: Power down [ 366s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:15:17 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:15:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5e1bd2cf179f1_12e32ae013cea5f416698ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1201s] make[5]: Nothing to be done for 'install-exec-am'. [ 1201s] make[5]: Nothing to be done for 'install-data-am'. [ 1201s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1201s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1201s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1201s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 1201s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 1201s] make[4]: Nothing to be done for 'install-exec-am'. [ 1201s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1201s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1201s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 1201s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1201s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1201s] dh_install [ 1201s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 1201s] [ 1201s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 1201s] dh_install: missing files, aborting [ 1201s] debian/rules:7: recipe for target 'binary' failed [ 1201s] make: *** [binary] Error 25 [ 1202s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1202s] [ 1202s] lamb21 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:15:03 UTC 2020. [ 1202s] [ 1202s] ### VM INTERACTION START ### [ 1205s] [ 1101.478519] sysrq: SysRq : Power Off [ 1205s] [ 1101.506751] reboot: Power down [ 1205s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:15:17 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:15:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5e1bd2cf8b4b5_12e32ae013cea5f4166994a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 982s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 982s] make[5]: Nothing to be done for 'install-exec-am'. [ 982s] make[5]: Nothing to be done for 'install-data-am'. [ 982s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 982s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 982s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 982s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 982s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 982s] make[4]: Nothing to be done for 'install-exec-am'. [ 982s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 982s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 982s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 982s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 982s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 982s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 982s] dh_install [ 982s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 982s] [ 982s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 982s] dh_install: missing files, aborting [ 982s] make: *** [debian/rules:7: binary] Error 255 [ 982s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 982s] [ 982s] lamb22 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:15:05 UTC 2020. [ 982s] [ 982s] ### VM INTERACTION START ### [ 985s] [ 958.150828] sysrq: SysRq : Power Off [ 985s] [ 958.201243] reboot: Power down [ 985s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:23:21 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:23:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5e1bd4b16d218_12e32ae013cea5f4167091f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1047s] make[5]: Nothing to be done for 'install-exec-am'. [ 1047s] make[5]: Nothing to be done for 'install-data-am'. [ 1047s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1047s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1047s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1047s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 1047s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 1047s] make[4]: Nothing to be done for 'install-exec-am'. [ 1047s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 1047s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 1047s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 1047s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1047s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1047s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1047s] dh_install [ 1048s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 1048s] [ 1048s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 1048s] dh_install: missing files, aborting [ 1048s] debian/rules:7: recipe for target 'binary' failed [ 1048s] make: *** [binary] Error 25 [ 1048s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1048s] [ 1048s] lamb02 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:23:03 UTC 2020. [ 1048s] [ 1048s] ### VM INTERACTION START ### [ 1051s] [ 988.380823] sysrq: SysRq : Power Off [ 1051s] [ 988.407002] reboot: Power down [ 1051s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:27:54 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:27:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5e1bd5beb2813_12e32ae013cea5f41671362@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 484s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 484s] make[5]: Nothing to be done for 'install-exec-am'. [ 484s] make[5]: Nothing to be done for 'install-data-am'. [ 484s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 484s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 484s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 484s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 484s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 484s] make[4]: Nothing to be done for 'install-exec-am'. [ 484s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 484s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 484s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 484s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 484s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 484s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 484s] dh_install [ 484s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") [ 484s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 484s] dh_install: missing files, aborting [ 484s] debian/rules:7: recipe for target 'binary' failed [ 484s] make: *** [binary] Error 255 [ 484s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 484s] [ 484s] obs-arm-9 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:27:48 UTC 2020. [ 484s] [ 484s] ### VM INTERACTION START ### [ 487s] [ 473.333886] sysrq: Power Off [ 487s] [ 473.337781] reboot: Power down [ 488s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:28:12 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:28:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5e1bd5de4748e_12e32ae013cea5f41671467@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1021s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 1021s] make[5]: Nothing to be done for 'install-exec-am'. [ 1021s] make[5]: Nothing to be done for 'install-data-am'. [ 1021s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1021s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1021s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1021s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 1021s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 1021s] make[4]: Nothing to be done for 'install-exec-am'. [ 1021s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1021s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 1021s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 1021s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1021s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1021s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1021s] dh_install [ 1021s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 1021s] [ 1021s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 1021s] dh_install: missing files, aborting [ 1021s] make: *** [debian/rules:7: binary] Error 255 [ 1021s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1021s] [ 1021s] lamb26 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:27:51 UTC 2020. [ 1021s] [ 1021s] ### VM INTERACTION START ### [ 1025s] [ 993.269474] sysrq: SysRq : Power Off [ 1025s] [ 993.288757] reboot: Power down [ 1025s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:31:54 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:31:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e1bd6af926f2_12e32ae013cea5f41671965@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 707s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 707s] make[5]: Nothing to be done for 'install-exec-am'. [ 707s] make[5]: Nothing to be done for 'install-data-am'. [ 707s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 707s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 707s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 707s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 707s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 707s] make[4]: Nothing to be done for 'install-exec-am'. [ 707s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 707s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 707s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 707s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 707s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 707s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 707s] dh_install [ 707s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 707s] [ 707s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 707s] dh_install: missing files, aborting [ 707s] make: *** [debian/rules:7: binary] Error 255 [ 707s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 707s] [ 707s] build35 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:31:49 UTC 2020. [ 707s] [ 707s] ### VM INTERACTION START ### [ 710s] [ 686.948456] sysrq: SysRq : Power Off [ 710s] [ 686.974446] reboot: Power down [ 710s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 02:33:37 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 02:33:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5e1bd70ad895f_12e32ae013cea5f416723bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 383s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 383s] make[5]: Nothing to be done for 'install-exec-am'. [ 383s] make[5]: Nothing to be done for 'install-data-am'. [ 383s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 383s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 383s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 383s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 383s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 383s] make[4]: Nothing to be done for 'install-exec-am'. [ 383s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 383s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 383s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 384s] dh_install [ 384s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 384s] [ 384s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 384s] dh_install: missing files, aborting [ 384s] make: *** [debian/rules:7: binary] Error 25 [ 384s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 384s] [ 384s] obs-arm-8 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 02:33:26 UTC 2020. [ 384s] [ 384s] ### VM INTERACTION START ### [ 387s] [ 371.690032] sysrq: Power Off [ 387s] [ 371.694143] reboot: Power down [ 387s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 04:57:37 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 04:57:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5e1bf8cab9ec2_12e32ae013cea5f41680071@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 566s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 566s] make[5]: Nothing to be done for 'install-exec-am'. [ 566s] make[5]: Nothing to be done for 'install-data-am'. [ 566s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 566s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 566s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 566s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 566s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 566s] make[4]: Nothing to be done for 'install-exec-am'. [ 566s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 566s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 566s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 566s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 566s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 566s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 566s] dh_install [ 566s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") [ 566s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 566s] dh_install: missing files, aborting [ 566s] debian/rules:7: recipe for target 'binary' failed [ 566s] make: *** [binary] Error 255 [ 566s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 566s] [ 566s] armbuild25 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 04:57:23 UTC 2020. [ 566s] [ 566s] ### VM INTERACTION START ### [ 569s] [ 538.000705] sysrq: SysRq : Power Off [ 569s] [ 538.006601] reboot: Power down [ 570s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 05:03:54 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 05:03:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e1bfa4de75b0_12e32ae013cea5f416802d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 704s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 704s] make[5]: Nothing to be done for 'install-exec-am'. [ 704s] make[5]: Nothing to be done for 'install-data-am'. [ 704s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 704s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 704s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 704s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 704s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 704s] make[4]: Nothing to be done for 'install-exec-am'. [ 704s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 704s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 704s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 704s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 704s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 704s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 704s] dh_install [ 704s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 704s] [ 704s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 704s] dh_install: missing files, aborting [ 704s] make: *** [debian/rules:7: binary] Error 25 [ 704s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 704s] [ 704s] armbuild22 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 05:03:32 UTC 2020. [ 704s] [ 704s] ### VM INTERACTION START ### [ 708s] [ 681.972441] sysrq: SysRq : Power Off [ 708s] [ 682.017087] reboot: Power down [ 708s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jan 13 05:23:20 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jan 2020 05:23:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/armv7l In-Reply-To: References: Message-ID: <5e1bfee28adc3_12e32ae013cea5f416816c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 1104s] make[5]: Entering directory '/usr/src/packages/BUILD/tests' [ 1104s] make[5]: Nothing to be done for 'install-exec-am'. [ 1104s] make[5]: Nothing to be done for 'install-data-am'. [ 1104s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1104s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1104s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1104s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 1104s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 1104s] make[4]: Nothing to be done for 'install-exec-am'. [ 1104s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 1104s] /usr/bin/install -c -m 644 libosmo-gsup-client.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 1104s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 1104s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1104s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1104s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1104s] dh_install [ 1105s] dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in ., debian/tmp) [ 1105s] [ 1105s] dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc [ 1105s] dh_install: missing files, aborting [ 1105s] make: *** [debian/rules:7: binary] Error 25 [ 1105s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 1105s] [ 1105s] armbuild04 failed "build osmo-hlr_1.2.0.7.110a.dsc" at Mon Jan 13 05:23:06 UTC 2020. [ 1105s] [ 1105s] ### VM INTERACTION START ### [ 1108s] [ 1009.711601] sysrq: SysRq : Power Off [ 1108s] [ 1009.730904] reboot: Power down [ 1109s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 13 09:29:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 09:29:08 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 (again) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16554 ) Change subject: docker: drop python2 (again) ...................................................................... Patch Set 2: Verified+1 I've tested jenkins.sh scripts of all repositories with this Dockerfile. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 Gerrit-Change-Number: 16554 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 13 Jan 2020 09:29:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 09:29:27 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 09:29:27 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 (again) In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16554 ) Change subject: docker: drop python2 (again) ...................................................................... docker: drop python2 (again) Re-apply patch Iacace670bdb949e67227e0faa1765e36bba42018, after providing additional patches to make all Osmocom repositories, that use external tests, work with python3 (after learning the hard way, that they were not really python3 compatible yet, although they looked like it): https://gerrit.osmocom.org/q/topic:drop-py2 This patch should not be merged, before all other patches from that topic are merged. Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Related: OS#2819 Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 2209fc6..63b6e74 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -85,7 +85,6 @@ osc \ patchelf \ pkg-config \ - python \ python3 \ python3-gi \ python3-mako \ @@ -95,10 +94,6 @@ python3-setuptools \ python3-usb \ python3-yaml \ - python-minimal \ - python-pip \ - python-pychart \ - python-setuptools \ rsync \ sdcc \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 Gerrit-Change-Number: 16554 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 09:37:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 09:37:49 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: > Patch Set 2: > > I would prefer if this was some kind of textual (human readable) parameter in the VTY. GSM/UMTS are complex enough as-is, we don't need to make it more complicated for people to write or read a config file by forcing the mto look up tables in specifications to figure out a certain numeric value. That's what we have value_string for, IMHO agree -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 09:37:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 09:57:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 09:57:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Patch Set 1: Code-Review+1 (6 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_CodecPort.ttcn File sccp/SCCP_CodecPort.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_CodecPort.ttcn at 4 PS1, Line 4: * octetstring payload towards the MTP3 imovider, and MTP3-SCCP primitives imovider is an IM provider? or an immobile provider? :P https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.cfg File sccp/SCCP_Tests_RAW.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.cfg at 17 PS1, Line 17: SCCP_Tests.sccp_cfg := { mp_sccp_cfg https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.cfg at 20 PS1, Line 20: //sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, this line can be dropped I guess https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.ttcn File sccp/SCCP_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.ttcn at 4 PS1, Line 4: * The idea is that these tests are executed against sccp_demo_user from Worth writing examples/sccp_demo_user since it's not installed. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.ttcn at 36 PS1, Line 36: * "System Under Test" is libosmo-sccp's sccp_demo_user example program. */ Worth writing examples/sccp_demo_user since it's not installed. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814/1/sccp/SCCP_Tests_RAW.ttcn at 160 PS1, Line 160: whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 09:57:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 09:58:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 09:58:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update most of our dependencies to upstream In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 ) Change subject: deps/Makefile: Update most of our dependencies to upstream ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 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: If5bd3d567de40ec2f72cdf63499435ac0bb4047e Gerrit-Change-Number: 16816 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 09:58:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 10:38:32 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 10:38:32 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 ) Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... Patch Set 1: (8 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1//COMMIT_MSG at 9 PS1, Line 9: coe (code) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/include/osmocom/sigtran/osmo_ss7.h File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/include/osmocom/sigtran/osmo_ss7.h at 432 PS1, Line 432: local_hosts (How about "hosts" instead of "local_hosts" and "host_cnt" instead of "local_host_cnt" (as in osmo_ss7.c)? (same in line below)) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/include/osmocom/sigtran/osmo_ss7.h at 432 PS1, Line 432: int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* local_hosts, size_t local_host_cnt); (line is > 100 characters) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c at 1116 PS1, Line 1116: int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* hosts, size_t host_cnt) (line > 100 characters) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c at 1135 PS1, Line 1135: (empty line should not be there) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c at 1141 PS1, Line 1141: /* Makes no sense to have INET_ANY and specific addresses in the set */ : for (i = 0; i < peer->host_cnt; i++) { : iter_is_any = !peer->host[i] || : !strcmp(peer->host[i], "0.0.0.0"); : if (new_is_any && iter_is_any) : return -EINVAL; : if (!new_is_any && iter_is_any) : return -EINVAL; : } : /* Makes no sense to have INET_ANY many times */ : if (new_is_any && peer->host_cnt) : return -EINVAL; (The logic here seems flawed / can be simplified (e.g. move the if (new_is_any ... check up, and we may not even need the for loop if there can only be one INET_ANY address in peer?)... but as I'm writing this, I realize that you just moved the code. So it's fine to leave it as-is in this patch.) https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c at 2036 PS1, Line 2036: rc This changes the logic; in the previous version, "osmo_stream_srv_link_set_addrs" would not get executed if the ARRAY_SIZE check failed. Is this on purpose, and if so, why not in a separate commit? https://gerrit.osmocom.org/c/libosmo-sccp/+/16795/1/src/osmo_ss7.c at 2046 PS1, Line 2046: rc same here -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 10:38:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 10:42:58 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 10:42:58 +0000 Subject: Change in libosmo-sccp[master]: ss7: Set ASP addresses using asp_peer APIs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 ) Change subject: ss7: Set ASP addresses using asp_peer APIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a Gerrit-Change-Number: 16796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 10:42:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 10:44:26 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 10:44:26 +0000 Subject: Change in libosmo-sccp[master]: ss7: Fix sccp_simple_server rejecting connections In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 ) Change subject: ss7: Fix sccp_simple_server rejecting connections ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e Gerrit-Change-Number: 16797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 13 Jan 2020 10:44:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 11:12:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Jan 2020 11:12:45 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: I'll rework the patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 11:12:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:00:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:00:10 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 to look at the new patch set (#2). Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... ss7: Introduce APIs to manage asp_peer hosts The code managing addresses is decoupled from xua_server since they will also be used to manage addresses for ASPs. Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 67 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/95/16795/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:00:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:00:11 +0000 Subject: Change in libosmo-sccp[master]: ss7: Improve checks in osmo_ss7_asp_peer_add_host() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 ) Change subject: ss7: Improve checks in osmo_ss7_asp_peer_add_host() ...................................................................... ss7: Improve checks in osmo_ss7_asp_peer_add_host() * Introduce check to make sure we don't write out of peer->host bounds. * Clean up any/specific address checks, it should be more clear now. Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf --- M src/osmo_ss7.c 1 file changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/31/16831/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 70ec847..b7d69cb 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1149,19 +1149,25 @@ bool new_is_any = !host || !strcmp(host, "0.0.0.0"); bool iter_is_any; - /* Makes no sense to have INET_ANY and specific addresses in the set */ - for (i = 0; i < peer->host_cnt; i++) { - iter_is_any = !peer->host[i] || - !strcmp(peer->host[i], "0.0.0.0"); - if (new_is_any && iter_is_any) - return -EINVAL; - if (!new_is_any && iter_is_any) - return -EINVAL; - } - /* Makes no sense to have INET_ANY many times */ - if (new_is_any && peer->host_cnt) + if (peer->host_cnt >= ARRAY_SIZE(peer->host)) return -EINVAL; + /* Makes no sense to have INET_ANY many times, or INET_ANY together with + specific addresses: */ + if (new_is_any && peer->host_cnt != 0) + return -EINVAL; + + /* Makes no sense to add specific address to set if INET_ANY is + already set: */ + if (!new_is_any) { + for (i = 0; i < peer->host_cnt; i++) { + iter_is_any = !peer->host[i] || + !strcmp(peer->host[i], "0.0.0.0"); + if (iter_is_any) + return -EINVAL; + } + } + osmo_talloc_replace_string(talloc_ctx, &peer->host[peer->host_cnt], host); peer->host_cnt++; return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf Gerrit-Change-Number: 16831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:39:13 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 12:39:13 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 ) Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 12:39:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:40:30 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 12:40:30 +0000 Subject: Change in libosmo-sccp[master]: ss7: Improve checks in osmo_ss7_asp_peer_add_host() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 ) Change subject: ss7: Improve checks in osmo_ss7_asp_peer_add_host() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf Gerrit-Change-Number: 16831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 12:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:41:34 +0000 Subject: Change in libosmo-sccp[master]: ss7: Return value from child function in osmo_ss7_xua_server_set_loca... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 ) Change subject: ss7: Return value from child function in osmo_ss7_xua_server_set_local_host ...................................................................... ss7: Return value from child function in osmo_ss7_xua_server_set_local_host It doesn't really change old behavior since it's impossible the child function returned an error with current implementation, but let's better return the return code in case new error paths are added. Change-Id: I24747578b3412b385c1ea1a14922f543f9023a27 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 1ca8b5e..ee762c4 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1979,8 +1979,7 @@ int osmo_ss7_xua_server_set_local_host(struct osmo_xua_server *xs, const char *local_host) { - osmo_ss7_xua_server_set_local_hosts(xs, &local_host, 1); - return 0; + return osmo_ss7_xua_server_set_local_hosts(xs, &local_host, 1); } int -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I24747578b3412b385c1ea1a14922f543f9023a27 Gerrit-Change-Number: 16794 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:41:34 +0000 Subject: Change in libosmo-sccp[master]: ss7: Introduce APIs to manage asp_peer hosts In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 ) Change subject: ss7: Introduce APIs to manage asp_peer hosts ...................................................................... ss7: Introduce APIs to manage asp_peer hosts The code managing addresses is decoupled from xua_server since they will also be used to manage addresses for ASPs. Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 67 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index de9494b..2502407 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -429,6 +429,9 @@ }; int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer); +int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, + const char* const* hosts, size_t host_cnt); +int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host); struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index ee762c4..7eb94b2 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1113,6 +1113,60 @@ return len; } +/*! \brief Set (copy) addresses for a given ASP peer. Previous addresses are freed. + * \param[in] peer Application Server Process peer whose addresses are to be set. + * \param[in] talloc_ctx talloc context used to allocate new addresses. + * \param[in] hosts Array of strings containing IP addresses. + * \param[in] host_cnt Number of strings in hosts + * \returns 0 on success; negtive otherwise */ +int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char* const* hosts, size_t host_cnt) +{ + int i = 0; + + if (host_cnt > ARRAY_SIZE(peer->host)) + return -EINVAL; + + for (; i < host_cnt; i++) + osmo_talloc_replace_string(talloc_ctx, &peer->host[i], hosts[i]); + for (; i < peer->host_cnt; i++) { + talloc_free(peer->host[i]); + peer->host[i] = NULL; + } + + peer->host_cnt = host_cnt; + return 0; +} + +/*! \brief Append (copy) address to a given ASP peer. Previous addresses are kept. + * \param[in] peer Application Server Process peer the address is appened to. + * \param[in] talloc_ctx talloc context used to allocate new address. + * \param[in] host string containing an IP addresses. + * \returns 0 on success; negtive otherwise */ +int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) + +{ + int i; + bool new_is_any = !host || !strcmp(host, "0.0.0.0"); + bool iter_is_any; + + /* Makes no sense to have INET_ANY and specific addresses in the set */ + for (i = 0; i < peer->host_cnt; i++) { + iter_is_any = !peer->host[i] || + !strcmp(peer->host[i], "0.0.0.0"); + if (new_is_any && iter_is_any) + return -EINVAL; + if (!new_is_any && iter_is_any) + return -EINVAL; + } + /* Makes no sense to have INET_ANY many times */ + if (new_is_any && peer->host_cnt) + return -EINVAL; + + osmo_talloc_replace_string(talloc_ctx, &peer->host[peer->host_cnt], host); + peer->host_cnt++; + return 0; +} + struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name) { @@ -1985,51 +2039,24 @@ int osmo_ss7_xua_server_set_local_hosts(struct osmo_xua_server *xs, const char **local_hosts, size_t local_host_cnt) { - int i = 0; + int rc; OSMO_ASSERT(ss7_initialized); - if (local_host_cnt > ARRAY_SIZE(xs->cfg.local.host)) - return -EINVAL; - - for (; i < local_host_cnt; i++) - osmo_talloc_replace_string(xs, &xs->cfg.local.host[i], local_hosts[i]); - for (; i < xs->cfg.local.host_cnt; i++) { - talloc_free(xs->cfg.local.host[i]); - xs->cfg.local.host[i] = NULL; - } - - xs->cfg.local.host_cnt = local_host_cnt; - - osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); - - return 0; + rc = osmo_ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt); + if (rc < 0) + return rc; + return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); } int osmo_ss7_xua_server_add_local_host(struct osmo_xua_server *xs, const char *local_host) { - int i; - bool new_is_any = !local_host || !strcmp(local_host, "0.0.0.0"); - bool iter_is_any; + int rc; - /* Makes no sense to have INET_ANY and specific addresses in the set */ - for (i = 0; i < xs->cfg.local.host_cnt; i++) { - iter_is_any = !xs->cfg.local.host[i] || - !strcmp(xs->cfg.local.host[i], "0.0.0.0"); - if (new_is_any && iter_is_any) - return -EINVAL; - if (!new_is_any && iter_is_any) - return -EINVAL; - } - /* Makes no sense to have INET_ANY many times */ - if (new_is_any && xs->cfg.local.host_cnt) - return -EINVAL; - - osmo_talloc_replace_string(xs, &xs->cfg.local.host[xs->cfg.local.host_cnt], local_host); - xs->cfg.local.host_cnt++; - - osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); - return 0; + rc = osmo_ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host); + if (rc < 0) + return rc; + return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); } void osmo_ss7_xua_server_destroy(struct osmo_xua_server *xs) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4af2a6915ac57c7baa67343bd9414c65154d67f7 Gerrit-Change-Number: 16795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:41:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:41:35 +0000 Subject: Change in libosmo-sccp[master]: ss7: Set ASP addresses using asp_peer APIs In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 ) Change subject: ss7: Set ASP addresses using asp_peer APIs ...................................................................... ss7: Set ASP addresses using asp_peer APIs Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a --- M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c 3 files changed, 14 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 7eb94b2..70ec847 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1800,7 +1800,6 @@ struct osmo_xua_server *oxs = osmo_stream_srv_link_get_data(link); struct osmo_stream_srv *srv; struct osmo_ss7_asp *asp; - int i; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); @@ -1840,6 +1839,7 @@ oxs->cfg.proto); if (asp) { char hostbuf[INET6_ADDRSTRLEN]; + const char *hostbuf_ptr = &hostbuf[0]; char portbuf[16]; osmo_sock_get_ip_and_port(fd, hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), false); @@ -1848,14 +1848,14 @@ asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; asp->cfg.local.port = oxs->cfg.local.port; - for (i = 0; i < oxs->cfg.local.host_cnt; i++) - asp->cfg.local.host[i] = talloc_strdup(asp, oxs->cfg.local.host[i]); - asp->cfg.local.host_cnt = oxs->cfg.local.host_cnt; asp->cfg.remote.port = atoi(portbuf); - asp->cfg.remote.host[0] = talloc_strdup(asp, hostbuf); - asp->cfg.remote.host_cnt = 1; asp->dyn_allocated = true; asp->server = srv; + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + (const char* const*)oxs->cfg.local.host, + oxs->cfg.local.host_cnt); + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, + &hostbuf_ptr, 1); osmo_ss7_asp_restart(asp); } } diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 591254e..2931fb9 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -615,8 +615,7 @@ "Local IP Address from which to contact of ASP\n") { struct osmo_ss7_asp *asp = vty->index; - osmo_talloc_replace_string(asp, &asp->cfg.local.host[asp->cfg.local.host_cnt], argv[0]); - asp->cfg.local.host_cnt++; + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, argv[0]); return CMD_SUCCESS; } @@ -626,8 +625,7 @@ "Remote IP Address of ASP\n") { struct osmo_ss7_asp *asp = vty->index; - osmo_talloc_replace_string(asp, &asp->cfg.remote.host[asp->cfg.remote.host_cnt], argv[0]); - asp->cfg.remote.host_cnt++; + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, argv[0]); return CMD_SUCCESS; } @@ -1780,15 +1778,11 @@ case L_CS7_ASP_NODE: asp = vty->index; /* If no local addr was set */ - if (!asp->cfg.local.host_cnt) { - asp->cfg.local.host[0] = NULL; - asp->cfg.local.host_cnt = 1; - } + if (!asp->cfg.local.host_cnt) + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, NULL); /* If no remote addr was set */ - if (!asp->cfg.remote.host_cnt) { - asp->cfg.remote.host[0] = "127.0.0.1"; - asp->cfg.remote.host_cnt = 1; - } + if (!asp->cfg.remote.host_cnt) + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); osmo_ss7_asp_restart(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; diff --git a/src/sccp_user.c b/src/sccp_user.c index 49cc212..39ebc71 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -566,19 +566,8 @@ if (!asp) goto out_rt; asp_created = true; - - asp->cfg.local.host[0] = NULL; - asp->cfg.remote.host[0] = NULL; - if (default_local_ip) { - asp->cfg.local.host[0] = - talloc_strdup(asp, default_local_ip); - } - if (default_remote_ip) { - asp->cfg.remote.host[0] = - talloc_strdup(asp, default_remote_ip); - } - asp->cfg.local.host_cnt = 1; - asp->cfg.remote.host_cnt = 1; + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); asp->simple_client_allocated = true; } else talloc_free(asp_name); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4736cb107a1987dab123744b98fb2b06a5e1167a Gerrit-Change-Number: 16796 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:41:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 12:41:36 +0000 Subject: Change in libosmo-sccp[master]: ss7: Fix sccp_simple_server rejecting connections In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 ) Change subject: ss7: Fix sccp_simple_server rejecting connections ...................................................................... ss7: Fix sccp_simple_server rejecting connections Server addresses (and remote added ones) were not being copied to the ASP and hence connections were not matches against the ASP when connecting: osmo_ss7.c:1820 (r=127.0.0.2:2905<->l=127.0.0.1:2905): m3ua connection without matching ASP definition and no dynamic registration enabled, terminating Related: OS#4355 Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e --- M src/sccp_user.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/src/sccp_user.c b/src/sccp_user.c index 39ebc71..9df5817 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -700,6 +700,7 @@ struct osmo_ss7_as *as; struct osmo_ss7_route *rt; struct osmo_ss7_asp *asp; + struct osmo_xua_server *oxs; char *as_name, *asp_name; if (local_port < 0) @@ -724,6 +725,15 @@ asp = osmo_ss7_asp_find_or_create(ss7, asp_name, remote_port, local_port, prot); if (!asp) goto out_rt; + oxs = osmo_ss7_xua_server_find(ss7, prot, local_port); + if (!oxs) + goto out_asp; + if (osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, + (const char* const*)oxs->cfg.local.host, + oxs->cfg.local.host_cnt) < 0) + goto out_asp; + if (osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0) + goto out_asp; asp->cfg.is_server = true; asp->cfg.role = OSMO_SS7_ASP_ROLE_SG; osmo_ss7_as_add_asp(as, asp_name); @@ -733,6 +743,8 @@ return ss7->sccp; +out_asp: + osmo_ss7_asp_destroy(asp); out_rt: osmo_ss7_route_destroy(rt); out_as: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I77d4f4d733cb46eaaacc7dc32259c9851c79d78e Gerrit-Change-Number: 16797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:48:10 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 13 Jan 2020 12:48:10 +0000 Subject: Change in libosmocore[master]: logging.c: Add valuestrings for loglevels References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16832 ) Change subject: logging.c: Add valuestrings for loglevels ...................................................................... logging.c: Add valuestrings for loglevels It might be helpful to convert a loglevel into a value string, lets add a function for this. Related: OS#2577 Change-Id: I81e58dbae9889f1424ff107a22ed0e838bea7f5b --- M include/osmocom/core/logging.h M src/logging.c 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/16832/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 79eec10..2d9dace 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -10,6 +10,8 @@ #include #include #include +#include + /*! Maximum number of logging contexts */ #define LOG_MAX_CTX 8 @@ -105,6 +107,11 @@ #define LOGL_ERROR 7 /*!< error condition, requires user action */ #define LOGL_FATAL 8 /*!< fatal, program aborted */ +extern const struct value_string log_level_names[]; +static inline const char *log_level_name(uint8_t val) { + return get_value_string(log_level_names, val); +} + /* logging subsystems defined by the library itself */ #define DLGLOBAL -1 /*!< global logging */ #define DLLAPD -2 /*!< LAPD implementation */ diff --git a/src/logging.c b/src/logging.c index 4d6224d..a871cad 100644 --- a/src/logging.c +++ b/src/logging.c @@ -64,6 +64,15 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); +const struct value_string log_level_names[] = { + { LOGL_DEBUG, "LOGL_DEBUG" }, + { LOGL_INFO, "LOGL_INFO" }, + { LOGL_NOTICE, "LOGL_NOTICE" }, + { LOGL_ERROR, "LOGL_ERROR" }, + { LOGL_FATAL, "LOGL_FATAL" }, + { 0, NULL } +}; + #if (!EMBEDDED) /*! This mutex must be held while using osmo_log_target_list or any of its log_targets in a multithread program. Prevents race conditions between threads -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81e58dbae9889f1424ff107a22ed0e838bea7f5b Gerrit-Change-Number: 16832 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 12:48:11 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 13 Jan 2020 12:48:11 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... application.c: check default loglevels on startup Default log levels should not be set lower than LOGL_NOTICE. If a lower loglevel is desired, this loglevel should be set via a configuration file. Lets print a warning if a default loglevel lower than LOGL_NOTICE is set to remind the programmer to set proper default loglevels. Related: OS#2577 Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 --- M src/application.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/16833/1 diff --git a/src/application.c b/src/application.c index 7fd6280..a7ed01e 100644 --- a/src/application.c +++ b/src/application.c @@ -117,6 +117,21 @@ return osmo_init_logging2(NULL, log_info); } +/* Check preset loglevels. This check prints a warning if the default loglevel + * is lower than LOGL_NOTICE, which should never be the default */ +static void check_loglevels(const struct log_info *log_info) +{ + unsigned int i; + for (i = 0; i < log_info->num_cat; i++) { + if (log_info->cat[i].loglevel < LOGL_NOTICE) { + printf + ("FIXME: The default loglevel of %s is set to %s. Default log levels should not be lower than LOGL_NOTICE -- please fix!\n", + log_info->cat[i].name, + log_level_name(log_info->cat[i].loglevel)); + } + } +} + int osmo_init_logging2(void *ctx, const struct log_info *log_info) { static int logging_initialized = 0; @@ -132,6 +147,8 @@ log_add_target(osmo_stderr_target); log_set_all_filter(osmo_stderr_target, 1); + check_loglevels(log_info); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:12:07 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 13:12:07 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#25) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am M src/gsupclient/gsup_client.c A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 38 files changed, 1,623 insertions(+), 903 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/25 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 25 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:12:07 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 13:12:07 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#5) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... db v6: determine 3G AUC IND from VLR name Each VLR requesting auth tuples should use a distinct IND pool for 3G auth. So far we tied the IND to the GSUP peer connection; MSC and SGSN were always distinct GSUP peers, they ended up using distinct INDs. However, we have implemented a GSUP proxy, so that, in a distributed setup, a remotely roaming subscriber has only one direct GSUP peer proxying for both remote MSC and SGSN. That means as soon as a subscriber roams to a different site, we would use the GSUP proxy name to determine the IND instead of the separate MSC and SGSN. The site's MSC and SGSN appear as the same client, get the same IND bucket, waste SQNs rapidly and cause auth tuple generation load. So instead of using the local client as IND, persistently keep a list of VLR names and assign a different IND to each. Use the gsup_req->source_name as indicator, which reflects the actual remote VLR's name (remote MSC or SGSN). Persist the site <-> IND assignments in the database. Add an IND test to db_test.c There was an earlier patch version that separated the IND pools by cn_domain, but it turned out to add complex semantics, while only solving one aspect of the "adjacent VLR" problem. We need a solution not only for CS vs PS, but also for 2,3G vs 4G, and for sites that are physically adjacent to each other. This patch version does not offer any automatic solution for that -- as soon as more than 2^IND_bitlen (usually 32) VLRs show up, it is the responsibility of the admin to ensure the 'ind' table in the hlr.db does not have unfortunate IND assignments. So far no VTY commands exist for that, they may be added in the future. Related: OS#4319 Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 --- M include/osmocom/hlr/db.h M sql/hlr.sql M src/db.c M src/db_hlr.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err M tests/db_upgrade/db_upgrade_test.ok 8 files changed, 292 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/16764/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:12:12 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 13:12:12 +0000 Subject: Change in osmo-hlr[master]: Makefile.am: fix pkgconfig_DATA References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16834 ) Change subject: Makefile.am: fix pkgconfig_DATA ...................................................................... Makefile.am: fix pkgconfig_DATA Fix building debian packages: dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc dh_install: missing files, aborting Fixes: bf7deda0fc30 ("add libosmo-mslookup abstract client") Change-Id: Ib0bce2d09b41834f7331969eaf7c57a9787f7efb --- M Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/34/16834/1 diff --git a/Makefile.am b/Makefile.am index a612bf4..a54dcb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,8 @@ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-gsup-client.pc +pkgconfig_DATA = libosmo-gsup-client.pc \ + libosmo-mslookup.pc @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib0bce2d09b41834f7331969eaf7c57a9787f7efb Gerrit-Change-Number: 16834 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:12:12 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 13:12:12 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup (#2) References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16835 ) Change subject: add mDNS lookup method to libosmo-mslookup (#2) ...................................................................... add mDNS lookup method to libosmo-mslookup (#2) Add the first actually useful lookup method to the mslookup library: multicast DNS. The server side is added in a subsequent commit, when the mslookup server is implemented for the osmo-hlr program. Use custom DNS encoding instead of libc-ares (which we use in OsmoSGSN already), because libc-ares is only a DNS client implementation and we will need both client and server. Resubmit of f10463c5fc6d9e786ab7c648d99f7450f9a25906 after being reverted in 110a49f69f29fed844d8743b76fd748f4a14812a. This new version skips the mslookup_client_mdns test if multicast is not supported in the build environment. I have verified that it doesn't break the build anymore in my own OBS namespace. Related: OS#4237, OS#4361 Patch-by: osmith, nhofmeyr Change-Id: I3c340627181b632dd6a0d577aa2ea2a7cd035c0c --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am A include/osmocom/mslookup/Makefile.am A include/osmocom/mslookup/mdns.h A include/osmocom/mslookup/mdns_msg.h A include/osmocom/mslookup/mdns_rfc.h A include/osmocom/mslookup/mdns_sock.h A include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am A src/mslookup/mdns.c A src/mslookup/mdns_msg.c A src/mslookup/mdns_rfc.c A src/mslookup/mdns_sock.c A src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am A tests/mslookup/mdns_test.c A tests/mslookup/mdns_test.err A tests/mslookup/mslookup_client_mdns_test.c A tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 2,864 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/35/16835/1 diff --git a/.gitignore b/.gitignore index acfea84..eec364a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,8 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump +tests/mslookup/mdns_test +tests/mslookup/mslookup_client_mdns_test tests/mslookup/mslookup_client_test tests/mslookup/mslookup_test diff --git a/configure.ac b/configure.ac index 217df9f..57aecba 100644 --- a/configure.ac +++ b/configure.ac @@ -178,6 +178,7 @@ include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile + include/osmocom/mslookup/Makefile libosmo-gsup-client.pc libosmo-mslookup.pc sql/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index e9a7126..9827950 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,10 @@ nobase_include_HEADERS = \ osmocom/gsupclient/gsup_client.h \ + osmocom/mslookup/mdns.h \ + osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ + osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index dbc2344..b75c86a 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ hlr \ + mslookup \ $(NULL) diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am new file mode 100644 index 0000000..72ccd94 --- /dev/null +++ b/include/osmocom/mslookup/Makefile.am @@ -0,0 +1,6 @@ +# most headers here are installed, see /include/Makefile.am + +noinst_HEADERS = \ + mdns_msg.h \ + mdns_rfc.h \ + $(NULL) diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h new file mode 100644 index 0000000..b62e95f --- /dev/null +++ b/include/osmocom/mslookup/mdns.h @@ -0,0 +1,39 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/*! \file mdns.h */ + +#pragma once + +#include +#include + +#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org" + +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix); + +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix); + +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix); + +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix); diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h new file mode 100644 index 0000000..ae7dd17 --- /dev/null +++ b/include/osmocom/mslookup/mdns_msg.h @@ -0,0 +1,54 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include "mdns_rfc.h" + +struct osmo_mdns_record { + struct llist_head list; + enum osmo_mdns_rfc_record_type type; + uint16_t length; + uint8_t *data; +}; + +struct osmo_mdns_msg_request { + uint16_t id; + char *domain; + enum osmo_mdns_rfc_record_type type; +}; + +struct osmo_mdns_msg_answer { + uint16_t id; + char *domain; + /*! list of osmo_mdns_record. */ + struct llist_head records; +}; + +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req); +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len); + +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer); +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans); +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len); +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans); + +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...); +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size); diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h new file mode 100644 index 0000000..9d6be5a --- /dev/null +++ b/include/osmocom/mslookup/mdns_rfc.h @@ -0,0 +1,113 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include + +/* RFC 1035 2.3.4 */ +#define OSMO_MDNS_RFC_MAX_NAME_LEN 255 + +/* RFC 1035 3.3 */ +#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256 + +enum osmo_mdns_rfc_record_type { + OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0, + + /* RFC 1035 3.2.2 */ + OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */ + OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */ + + /* RFC 3596 2.1 */ + OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */ + + /* RFC 1035 3.2.3 */ + OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */ +}; + +enum osmo_mdns_rfc_class { + OSMO_MDNS_RFC_CLASS_UNKNOWN = 0, + + /* RFC 1035 3.2.4 */ + OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */ + + /* RFC 1035 3.2.5 */ + OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */ +}; + +/* RFC 1035 4.1.1 */ +struct osmo_mdns_rfc_header { +#if OSMO_IS_LITTLE_ENDIAN + uint16_t id; + uint8_t rd:1, + tc:1, + aa:1, + opcode:4, + qr:1; /* QR (0: query, 1: response) */ + uint8_t rcode:4, + z:3, + ra:1; + uint16_t qdcount; /* Number of questions */ + uint16_t ancount; /* Number of answers */ + uint16_t nscount; /* Number of authority records */ + uint16_t arcount; /* Number of additional records */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t id; + uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1; + uint8_t ra:1, z:3, rcode:4; + uint16_t qdcount; + uint16_t ancount; + uint16_t nscount; + uint16_t arcount; +#endif +} __attribute__ ((packed)); + +/* RFC 1035 4.1.2 */ +struct osmo_mdns_rfc_question { + char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type qtype; + enum osmo_mdns_rfc_class qclass; +}; + +/* RFC 1035 4.1.3 */ +struct osmo_mdns_rfc_record { + char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type type; + enum osmo_mdns_rfc_class class; + uint32_t ttl; + uint16_t rdlength; + uint8_t *rdata; +}; + +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); + +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); + +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); + +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len); diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h new file mode 100644 index 0000000..615e971 --- /dev/null +++ b/include/osmocom/mslookup/mdns_sock.h @@ -0,0 +1,33 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once +#include +#include +#include + +struct osmo_mdns_sock { + struct osmo_fd osmo_fd; + struct addrinfo *ai; +}; + +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr); +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg); +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock); diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h new file mode 100644 index 0000000..e699107 --- /dev/null +++ b/include/osmocom/mslookup/mslookup_client_mdns.h @@ -0,0 +1,38 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include + +struct osmo_mslookup_client; +struct osmo_mslookup_client_method; + +/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational + * Scoped range, https://tools.ietf.org/html/rfc2365 . */ +#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42" +#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane? +#define OSMO_MSLOOKUP_MDNS_PORT 4266 + +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix); + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method); + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method); diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 01be401..07fb6f4 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -10,9 +10,14 @@ lib_LTLIBRARIES = libosmo-mslookup.la libosmo_mslookup_la_SOURCES = \ + mdns.c \ + mdns_msg.c \ + mdns_rfc.c \ + mdns_sock.c \ mslookup.c \ mslookup_client.c \ mslookup_client_fake.c \ + mslookup_client_mdns.c \ $(NULL) libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c new file mode 100644 index 0000000..4742a7c --- /dev/null +++ b/src/mslookup/mdns.c @@ -0,0 +1,425 @@ +/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high + * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +static struct msgb *osmo_mdns_msgb_alloc(const char *label) +{ + return msgb_alloc(1024, label); +} + +/*! Combine the mslookup query service, ID and ID type into a domain string. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success, + * NULL on failure. + */ +static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix) +{ + const char *id; + + /* Get id from query */ + switch (query->id.type) { + case OSMO_MSLOOKUP_ID_IMSI: + id = query->id.imsi; + break; + case OSMO_MSLOOKUP_ID_MSISDN: + id = query->id.msisdn; + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type); + return NULL; + } + + return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type), + domain_suffix); +} + +/*! Split up query service, ID and ID type from a domain string into a mslookup query. + * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org" + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we + * remove it in this function. Example: "mdns.osmocom.org" + */ +int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix) +{ + int domain_len = strlen(domain) - strlen(domain_suffix) - 1; + char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN]; + + if (domain_len <= 0 || domain_len >= sizeof(domain_buf)) + return -EINVAL; + + if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0) + return -EINVAL; + + memcpy(domain_buf, domain, domain_len); + domain_buf[domain_len] = '\0'; + return osmo_mslookup_query_init_from_domain_str(query, domain_buf); +} + +/*! Encode a mslookup query into a mDNS packet. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msgb, or NULL on error. + */ +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix) +{ + struct osmo_mdns_msg_request req = {0}; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + + req.id = packet_id; + req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL; + req.domain = domain_from_query(ctx, query, domain_suffix); + if (!req.domain) + goto error; + if (osmo_mdns_msg_request_encode(ctx, msg, &req)) + goto error; + talloc_free(req.domain); + return msg; +error: + msgb_free(msg); + talloc_free(req.domain); + return NULL; +} + +/*! Decode a mDNS request packet into a mslookup query. + * \param[out] packet_id the result must be sent with the same packet_id. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated mslookup query on success, NULL on error. + */ +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix) +{ + struct osmo_mdns_msg_request *req = NULL; + struct osmo_mslookup_query *query = NULL; + + req = osmo_mdns_msg_request_decode(ctx, data, data_len); + if (!req) + return NULL; + + query = talloc_zero(ctx, struct osmo_mslookup_query); + OSMO_ASSERT(query); + if (query_from_domain(query, req->domain, domain_suffix) < 0) + goto error_free; + + *packet_id = req->id; + talloc_free(req); + return query; +error_free: + talloc_free(req); + talloc_free(query); + return NULL; +} + +/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it. + * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str. + * \param[in] rec single record of the abstracted list of mDNS records + * \returns 0 on success, -EINVAL on error. + */ +static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec) +{ + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (rec->length != 4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0); + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (rec->length != 16) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0); + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + return 0; +} + +/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet. + * + * The records in the packet are ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[in] packet_id as received in osmo_mdns_query_decode(). + * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn"). + * \param[in] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msg on success, NULL on error. + */ +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix) +{ + struct osmo_mdns_msg_answer ans = {}; + struct osmo_mdns_record *rec_age = NULL; + struct osmo_mdns_record rec_ip_v4 = {0}; + struct osmo_mdns_record rec_ip_v6 = {0}; + struct osmo_mdns_record *rec_ip_v4_port = NULL; + struct osmo_mdns_record *rec_ip_v6_port = NULL; + struct in_addr rec_ip_v4_in; + struct in6_addr rec_ip_v6_in; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + char buf[256]; + + ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode"); + + /* Prepare answer (ans) */ + ans.domain = domain_from_query(ctx, query, domain_suffix); + if (!ans.domain) + goto error; + ans.id = packet_id; + INIT_LLIST_HEAD(&ans.records); + + /* Record for age */ + rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age); + OSMO_ASSERT(rec_age); + llist_add_tail(&rec_age->list, &ans.records); + + /* Records for IPv4 */ + if (osmo_sockaddr_str_is_set(&result->host_v4)) { + if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in; + rec_ip_v4.length = sizeof(rec_ip_v4_in); + llist_add_tail(&rec_ip_v4.list, &ans.records); + + rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port); + OSMO_ASSERT(rec_ip_v4_port); + llist_add_tail(&rec_ip_v4_port->list, &ans.records); + } + + /* Records for IPv6 */ + if (osmo_sockaddr_str_is_set(&result->host_v6)) { + if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in; + rec_ip_v6.length = sizeof(rec_ip_v6_in); + llist_add_tail(&rec_ip_v6.list, &ans.records); + + rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port); + OSMO_ASSERT(rec_ip_v6_port); + llist_add_tail(&rec_ip_v6_port->list, &ans.records); + } + + if (osmo_mdns_msg_answer_encode(ctx, msg, &ans)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + talloc_free(ctx); + return msg; +error: + msgb_free(msg); + talloc_free(ctx); + return NULL; +} + +static int decode_uint32_t(const char *str, uint32_t *val) +{ + long long int lld; + char *endptr = NULL; + *val = 0; + errno = 0; + lld = strtoll(str, &endptr, 10); + if (errno || !endptr || *endptr) + return -EINVAL; + if (lld < 0 || lld > UINT32_MAX) + return -EINVAL; + *val = lld; + return 0; +} + +static int decode_port(const char *str, uint16_t *port) +{ + uint32_t val; + if (decode_uint32_t(str, &val)) + return -EINVAL; + if (val > 65535) + return -EINVAL; + *port = val; + return 0; +} + +/*! Read expected mDNS records into mslookup result. + * + * The records in the packet must be ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] ans abstracted mDNS answer with a list of resource records. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_record *rec; + char txt_key[64]; + char txt_value[64]; + bool found_age = false; + bool found_ip_v4 = false; + bool found_ip_v6 = false; + struct osmo_sockaddr_str *expect_port_for = NULL; + + *result = (struct osmo_mslookup_result){}; + + result->rc = OSMO_MSLOOKUP_RC_NONE; + + llist_for_each_entry(rec, &ans->records, list) { + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'A' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v4 = true; + expect_port_for = &result->host_v4; + if (sockaddr_str_from_mdns_record(expect_port_for, rec)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'AAAA' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v6) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v6 = true; + expect_port_for = &result->host_v6; + if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_TXT: + if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key), + txt_value, sizeof(txt_value)) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n"); + return -EINVAL; + } + if (strcmp(txt_key, "age") == 0) { + if (found_age) { + LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n"); + return -EINVAL; + } + found_age = true; + if (decode_uint32_t(txt_value, &result->age)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value); + return -EINVAL; + } + } else if (strcmp(txt_key, "port") == 0) { + if (!expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n"); + return -EINVAL; + } + if (decode_port(txt_value, &expect_port_for->port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value); + return -EINVAL; + } + expect_port_for = NULL; + } else { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key); + return -EINVAL; + } + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + } + + /* Check if everything was found */ + if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n"); + return -EINVAL; + } + + result->rc = OSMO_MSLOOKUP_RC_RESULT; + return 0; +} + +/*! Decode a mDNS answer packet into a mslookup result, query and packet_id. + * \param[out] packet_id same ID as sent in the request packet. + * \param[out] query the original query (service, ID, ID type). + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix) +{ + int rc = -EINVAL; + struct osmo_mdns_msg_answer *ans; + ans = osmo_mdns_msg_answer_decode(ctx, data, data_len); + if (!ans) + goto exit_free; + + if (query_from_domain(query, ans->domain, domain_suffix) < 0) + goto exit_free; + + if (osmo_mdns_result_from_answer(result, ans) < 0) + goto exit_free; + + *packet_id = ans->id; + rc = 0; + +exit_free: + talloc_free(ans); + return rc; +} diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c new file mode 100644 index 0000000..da65fef --- /dev/null +++ b/src/mslookup/mdns_msg.c @@ -0,0 +1,261 @@ +/* High level mDNS encoding and decoding functions for whole messages: + * Request message (header, question) + * Answer message (header, resource record 1, ... resource record N)*/ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include + +/*! Encode request message into one mDNS packet, consisting of the header section and one question section. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_rfc_question qst = {0}; + + hdr.id = req->id; + hdr.qdcount = 1; + osmo_mdns_rfc_header_encode(msg, &hdr); + + qst.domain = req->domain; + qst.qtype = req->type; + qst.qclass = OSMO_MDNS_RFC_CLASS_IN; + if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) + return -EINVAL; + + return 0; +} + +/*! Decode request message from a mDNS packet, consisting of the header section and one question section. + * \returns allocated request message on success, NULL on error. + */ +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {0}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_rfc_question* qst = NULL; + struct osmo_mdns_msg_request *ret = NULL; + + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0) + return NULL; + + qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len); + if (!qst) + return NULL; + + ret = talloc_zero(ctx, struct osmo_mdns_msg_request); + ret->id = hdr.id; + ret->domain = talloc_strdup(ret, qst->domain); + ret->type = qst->qtype; + + talloc_free(qst); + return ret; +} + +/*! Initialize the linked list for resource records in a answer message. */ +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans) +{ + *ans = (struct osmo_mdns_msg_answer){}; + INIT_LLIST_HEAD(&ans->records); +} + +/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records. + * + * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of + * "message compression", which would send a question section with the domain before the resource records, and then + * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4). + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_record *ans_record; + + hdr.id = ans->id; + hdr.qr = 1; + hdr.ancount = llist_count(&ans->records); + osmo_mdns_rfc_header_encode(msg, &hdr); + + llist_for_each_entry(ans_record, &ans->records, list) { + struct osmo_mdns_rfc_record rec = {0}; + + rec.domain = ans->domain; + rec.type = ans_record->type; + rec.class = OSMO_MDNS_RFC_CLASS_IN; + rec.ttl = 0; + rec.rdlength = ans_record->length; + rec.rdata = ans_record->data; + + if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) + return -EINVAL; + } + + return 0; +} + +/*! Decode answer message from a mDNS packet. + * + * Answer messages must consist of one header and one or more resource records. An additional question section or + * message compression (RFC 1035 4.1.4) are not supported. +* \returns allocated answer message on success, NULL on error. + */ +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer); + + /* Parse header section */ + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1) + goto error; + ret->id = hdr.id; + data_len -= hdr_len; + data += hdr_len; + + /* Parse resource records */ + INIT_LLIST_HEAD(&ret->records); + while (data_len) { + size_t record_len; + struct osmo_mdns_rfc_record *rec; + struct osmo_mdns_record* ret_record; + + rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len); + if (!rec) + goto error; + + /* Copy domain to ret */ + if (ret->domain) { + if (strcmp(ret->domain, rec->domain) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n", + ret->domain, rec->domain); + goto error; + } + } + else + ret->domain = talloc_strdup(ret, rec->domain); + + /* Add simplified record to ret */ + ret_record = talloc_zero(ret, struct osmo_mdns_record); + ret_record->type = rec->type; + ret_record->length = rec->rdlength; + ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength); + llist_add_tail(&ret_record->list, &ret->records); + + data += record_len; + data_len -= record_len; + talloc_free(rec); + } + + /* Verify record count */ + if (llist_count(&ret->records) != hdr.ancount) { + LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n", + llist_count(&ret->records), hdr.ancount); + goto error; + } + + return ret; +error: + talloc_free(ret); + return NULL; +} + +/*! Get a TXT resource record, which stores a key=value string. + * \returns allocated resource record on success, NULL on error. + */ +static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value) +{ + struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record); + size_t len = strlen(key) + 1 + strlen(value); + + if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1) + return NULL; + + /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */ + ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value); + if (!ret->data) + return NULL; + ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT; + ret->length = len + 1; + return ret; +} + +/*! Get a TXT resource record, which stores a key=value string, but build value from a format string. + * \returns allocated resource record on success, NULL on error. + */ +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...) +{ + va_list ap; + char *value = NULL; + struct osmo_mdns_record *r; + + if (!value_fmt) + return _osmo_mdns_record_txt_encode(ctx, key, ""); + + va_start(ap, value_fmt); + value = talloc_vasprintf(ctx, value_fmt, ap); + if (!value) + return NULL; + va_end(ap); + r = _osmo_mdns_record_txt_encode(ctx, key, value); + talloc_free(value); + return r; +} + +/*! Decode a TXT resource record, which stores a key=value string. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size) +{ + const char *key_value; + const char *key_value_end; + const char *sep; + const char *value; + + if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT) + return -EINVAL; + + key_value = (const char *)rec->data; + key_value_end = key_value + rec->length; + + /* Verify and then skip the redundant string length byte */ + if (*key_value != rec->length - 1) + return -EINVAL; + key_value++; + + if (key_value >= key_value_end) + return -EINVAL; + + /* Find equals sign */ + sep = osmo_strnchr(key_value, key_value_end - key_value, '='); + if (!sep) + return -EINVAL; + + /* Parse key */ + osmo_print_n(key_buf, key_size, key_value, sep - key_value); + + /* Parse value */ + value = sep + 1; + osmo_print_n(value_buf, value_size, value, key_value_end - value); + return 0; +} diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c new file mode 100644 index 0000000..e1fc184 --- /dev/null +++ b/src/mslookup/mdns_rfc.c @@ -0,0 +1,265 @@ +/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records, + * as described in these RFCs: + * - RFC 1035 (Domain names - implementation and specification) + * - RFC 3596 (DNS Extensions to Support IP Version 6) */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +/* + * Encode/decode IEs + */ + +/*! Encode a domain string as qname (RFC 1035 4.1.2). + * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". + * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. + */ +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) +{ + char *domain_dup; + char *domain_iter; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + char *label; + + if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + domain_iter = domain_dup = talloc_strdup(ctx, domain); + while ((label = strsep(&domain_iter, "."))) { + size_t len = strlen(label); + + /* Empty domain, dot at start, two dots in a row, or ending with a dot */ + if (!len) + goto error; + + OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); + } + + talloc_free(domain_dup); + return talloc_strdup(ctx, buf); + +error: + talloc_free(domain_dup); + return NULL; +} + +/*! Decode a domain string from a qname (RFC 1035 4.1.2). + * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) + * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. + * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), + * NULL on error. + */ +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) +{ + const char *next_label, *qname_end = qname + qname_max_len; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; + int i = 0; + + if (qname_max_len < 1) + return NULL; + + while (*qname) { + size_t len = *qname; + next_label = qname + len + 1; + + if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + if (i) { + /* Two dots in a row is not allowed */ + if (buf[i - 1] == '.') + return NULL; + + buf[i] = '.'; + i++; + } + + memcpy(buf + i, qname + 1, len); + i += len; + qname = next_label; + } + buf[i] = '\0'; + + return talloc_strdup(ctx, buf); +} + +/* + * Encode/decode message sections + */ + +/*! Encode header section (RFC 1035 4.1.1). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr) +{ + struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr)); + memcpy(buf, hdr, sizeof(*hdr)); + + osmo_store16be(buf->id, &buf->id); + osmo_store16be(buf->qdcount, &buf->qdcount); + osmo_store16be(buf->ancount, &buf->ancount); + osmo_store16be(buf->nscount, &buf->nscount); + osmo_store16be(buf->arcount, &buf->arcount); +} + +/*! Decode header section (RFC 1035 4.1.1). */ +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr) +{ + if (data_len != sizeof(*hdr)) + return -EINVAL; + + memcpy(hdr, data, data_len); + + hdr->id = osmo_load16be(&hdr->id); + hdr->qdcount = osmo_load16be(&hdr->qdcount); + hdr->ancount = osmo_load16be(&hdr->ancount); + hdr->nscount = osmo_load16be(&hdr->nscount); + hdr->arcount = osmo_load16be(&hdr->arcount); + + return 0; +} + +/*! Encode question section (RFC 1035 4.1.2). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) +{ + char *qname; + size_t qname_len; + uint8_t *qname_buf; + + /* qname */ + qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); + if (!qname) + return -EINVAL; + qname_len = strlen(qname) + 1; + qname_buf = msgb_put(msg, qname_len); + memcpy(qname_buf, qname, qname_len); + talloc_free(qname); + + /* qtype and qclass */ + msgb_put_u16(msg, qst->qtype); + msgb_put_u16(msg, qst->qclass); + + return 0; +} + +/*! Decode question section (RFC 1035 4.1.2). */ +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_question *ret; + size_t qname_len = data_len - 4; + + if (data_len < 6) + return NULL; + + /* qname */ + ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); + if (!ret) + return NULL; + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); + if (!ret->domain) { + talloc_free(ret); + return NULL; + } + + /* qtype and qclass */ + ret->qtype = osmo_load16be(data + qname_len); + ret->qclass = osmo_load16be(data + qname_len + 2); + + return ret; +} + +/* + * Encode/decode resource records + */ + +/*! Encode one resource record (RFC 1035 4.1.3). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) +{ + char *name; + size_t name_len; + uint8_t *buf; + + /* name */ + name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); + if (!name) + return -EINVAL; + name_len = strlen(name) + 1; + buf = msgb_put(msg, name_len); + memcpy(buf, name, name_len); + talloc_free(name); + + /* type, class, ttl, rdlength */ + msgb_put_u16(msg, rec->type); + msgb_put_u16(msg, rec->class); + msgb_put_u32(msg, rec->ttl); + msgb_put_u16(msg, rec->rdlength); + + /* rdata */ + buf = msgb_put(msg, rec->rdlength); + memcpy(buf, rec->rdata, rec->rdlength); + return 0; +} + +/*! Decode one resource record (RFC 1035 4.1.3). */ +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len) +{ + struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); + size_t name_len; + + /* name */ + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); + if (!ret->domain) + goto error; + name_len = strlen(ret->domain) + 2; + if (name_len + 10 > data_len) + goto error; + + /* type, class, ttl, rdlength */ + ret->type = osmo_load16be(data + name_len); + ret->class = osmo_load16be(data + name_len + 2); + ret->ttl = osmo_load32be(data + name_len + 4); + ret->rdlength = osmo_load16be(data + name_len + 8); + if (name_len + 10 + ret->rdlength > data_len) + goto error; + + /* rdata */ + ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength); + if (!ret->rdata) + return NULL; + + *record_len = name_len + 10 + ret->rdlength; + return ret; +error: + talloc_free(ret); + return NULL; +} + diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c new file mode 100644 index 0000000..5291660 --- /dev/null +++ b/src/mslookup/mdns_sock.c @@ -0,0 +1,144 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*! Open socket to send and receive multicast data. + * + * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives + * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever + * sending something, the receive callback will be called with the same data and should discard it. + * + * \param[in] ip multicast IPv4 or IPv6 address. + * \param[in] port port number. + * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd). + * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data). + * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr). + * \returns allocated osmo_mdns_sock, NULL on error. + */ +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr) +{ + struct osmo_mdns_sock *ret; + int sock, rc; + struct addrinfo hints = {0}; + struct ip_mreq multicast_req = {0}; + in_addr_t iface = INADDR_ANY; + char portbuf[10]; + int y = 1; + + snprintf(portbuf, sizeof(portbuf) -1, "%u", port); + ret = talloc_zero(ctx, struct osmo_mdns_sock); + OSMO_ASSERT(ret); + + /* Fill addrinfo */ + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); + rc = getaddrinfo(ip, portbuf, &hints, &ret->ai); + if (rc != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc)); + ret->ai = NULL; + goto error; + } + + /* Open socket */ + sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0); + if (sock == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno)); + goto error; + } + + /* Set multicast options */ + rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, + sizeof(multicast_req.imr_multiaddr)); + multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); + rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by + * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for + * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same + * time need to be resolved with the simple dialplan example that just starts new processes). */ + rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Bind and register osmo_fd callback */ + rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); + goto error; + } + osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); + if (osmo_fd_register(&ret->osmo_fd) != 0) + goto error; + + return ret; +error: + if (ret->ai) + freeaddrinfo(ret->ai); + talloc_free(ret); + return NULL; +} + +/*! Send msgb over mdns_sock and consume msgb. + * \returns 0 on success, -1 on error. + */ +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) +{ + size_t len = msgb_length(msg); + int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr, + mdns_sock->ai->ai_addrlen); + msgb_free(msg); + return (rc == len) ? 0 : -1; +} + +/*! Tear down osmo_mdns_sock. */ +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock) +{ + osmo_fd_close(&mdns_sock->osmo_fd); + freeaddrinfo(mdns_sock->ai); + talloc_free(mdns_sock); +} diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c new file mode 100644 index 0000000..7ba3502 --- /dev/null +++ b/src/mslookup/mslookup_client_mdns.c @@ -0,0 +1,235 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct osmo_mdns_method_state { + /* Parameters passed by _add_method_dns() */ + struct osmo_sockaddr_str bind_addr; + const char *domain_suffix; + + struct osmo_mdns_sock *mc; + + struct osmo_mslookup_client *client; + struct llist_head requests; + uint16_t next_packet_id; +}; + +struct osmo_mdns_method_request { + struct llist_head entry; + uint32_t request_handle; + struct osmo_mslookup_query query; + uint16_t packet_id; +}; + +static int request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state, + struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mdns_method_request *request; + + llist_for_each_entry(request, &state->requests, entry) { + if (strcmp(request->query.service, query->service) != 0) + continue; + if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0) + continue; + + /* Match! */ + *request_handle = request->request_handle; + return 0; + } + return -1; +} + +static int mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + struct osmo_mdns_method_state *state = osmo_fd->data; + struct osmo_mslookup_result result; + struct osmo_mslookup_query query; + uint16_t packet_id; + int n; + uint8_t buffer[1024]; + uint32_t request_handle = 0; + void *ctx = state; + + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + if (n < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n"); + return n; + } + + if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0) + return -EINVAL; + + if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0) + return -EINVAL; + + osmo_mslookup_client_rx_result(state->client, request_handle, &result); + return n; +} + +static void mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query, + uint32_t request_handle) +{ + char buf[256]; + struct osmo_mdns_method_state *state = method->priv; + struct msgb *msg; + struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request); + + *r = (struct osmo_mdns_method_request){ + .request_handle = request_handle, + .query = *query, + .packet_id = state->next_packet_id, + }; + llist_add(&r->entry, &state->requests); + state->next_packet_id++; + + msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix); + if (!msg) { + LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + } + + /* Send over the wire */ + LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service, + osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id)); + if (osmo_mdns_sock_send(state->mc, msg) == -1) + LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\n"); +} + +static void mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle) +{ + struct osmo_mdns_method_state *state = method->priv; + + /* Tear down any state associated with this handle. */ + struct osmo_mdns_method_request *r; + llist_for_each_entry(r, &state->requests, entry) { + if (r->request_handle != request_handle) + continue; + llist_del(&r->entry); + talloc_free(r); + return; + } +} + +static void mdns_method_destruct(struct osmo_mslookup_client_method *method) +{ + struct osmo_mdns_method_state *state = method->priv; + struct osmo_mdns_method_request *e, *n; + if (!state) + return; + + /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will + * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */ + llist_for_each_entry_safe(e, n, &state->requests, entry) { + llist_del(&e->entry); + } + + osmo_mdns_sock_cleanup(state->mc); +} + +/*! Initialize the mDNS lookup method. + * \param[in] client the client to attach the method to. + * \param[in] ip IPv4 or IPv6 address string. + * \param[in] port The port to bind to. + * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All + * servers answer to each query with the same packet ID. Set to -1 to use a random + * initial ID (recommended unless you need deterministic output). This ID is for visually + * distinguishing the packets in packet sniffers, the mslookup client uses not just the + * ID, but all query parameters (service type, ID, ID type), to determine if a reply is + * relevant. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" */ +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix) +{ + struct osmo_mdns_method_state *state; + struct osmo_mslookup_client_method *m; + + m = talloc_zero(client, struct osmo_mslookup_client_method); + OSMO_ASSERT(m); + + state = talloc_zero(m, struct osmo_mdns_method_state); + OSMO_ASSERT(state); + INIT_LLIST_HEAD(&state->requests); + if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n", + ip, port); + goto error_cleanup; + } + + if (initial_packet_id == -1) { + if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n"); + goto error_cleanup; + } + } else + state->next_packet_id = initial_packet_id; + + state->client = client; + state->domain_suffix = domain_suffix; + + state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0); + if (!state->mc) + goto error_cleanup; + + *m = (struct osmo_mslookup_client_method){ + .name = "mDNS", + .priv = state, + .request = mdns_method_request, + .request_cleanup = mdns_method_request_cleanup, + .destruct = mdns_method_destruct, + }; + + osmo_mslookup_client_method_add(client, m); + return m; + +error_cleanup: + talloc_free(m); + return NULL; +} + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return &state->bind_addr; +} + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return state->domain_suffix; +} diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index 71602a3..ebf2add 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -16,11 +16,15 @@ $(NULL) EXTRA_DIST = \ + mdns_test.err \ + mslookup_client_mdns_test.err \ mslookup_client_test.err \ mslookup_test.err \ $(NULL) check_PROGRAMS = \ + mdns_test \ + mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -41,6 +45,22 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +mdns_test_SOURCES = \ + mdns_test.c \ + $(NULL) +mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c new file mode 100644 index 0000000..8a60e85 --- /dev/null +++ b/tests/mslookup/mdns_test.c @@ -0,0 +1,602 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct qname_enc_dec_test { + const char *domain; + const char *qname; + size_t qname_max_len; /* default: strlen(qname) + 1 */ +}; + +static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { + { + /* OK: typical mslookup domain */ + .domain = "hlr.1234567.imsi", + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: double dot */ + .domain = "hlr..imsi", + .qname = NULL, + }, + { + /* Wrong format: double dot */ + .domain = "hlr", + .qname = "\x03hlr\0\x03imsi", + }, + { + /* Wrong format: dot at end */ + .domain = "hlr.", + .qname = NULL, + }, + { + /* Wrong format: dot at start */ + .domain = ".hlr", + .qname = NULL, + }, + { + /* Wrong format: empty */ + .domain = "", + .qname = NULL, + }, + { + /* OK: maximum length */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345" + , + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\x05" "12345" + }, + { + /* Error: too long domain */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345toolong" + , + .qname = NULL, + }, + { + /* Error: too long qname */ + .domain = NULL, + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: token length at end of qname */ + .domain = NULL, + .qname = "\x03hlr\x03", + }, + { + /* Error: overflow in label length */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + .qname_max_len = 17, + }, +}; + +void test_enc_dec_rfc_qname(void *ctx) +{ + char quote_buf[300]; + int i; + + fprintf(stderr, "-- %s --\n", __func__); + + for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { + const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; + char *res; + + if (t->domain) { + fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + res = osmo_mdns_rfc_qname_encode(ctx, t->domain); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + + if (t->qname) { + size_t qname_max_len = t->qname_max_len; + if (qname_max_len) + fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); + else + qname_max_len = strlen(t->qname) + 1; + + fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + } +} + +#define PRINT_HDR(hdr, name) \ + fprintf(stderr, "header %s:\n" \ + ".id = %i\n" \ + ".qr = %i\n" \ + ".opcode = %x\n" \ + ".aa = %i\n" \ + ".tc = %i\n" \ + ".rd = %i\n" \ + ".ra = %i\n" \ + ".z = %x\n" \ + ".rcode = %x\n" \ + ".qdcount = %u\n" \ + ".ancount = %u\n" \ + ".nscount = %u\n" \ + ".arcount = %u\n", \ + name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \ + hdr.ancount, hdr.nscount, hdr.arcount) + +static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = { + { + /* Typical use case for mslookup */ + .id = 1337, + .qdcount = 1, + }, + { + /* Fill out everything */ + .id = 42, + .qr = 1, + .opcode = 0x02, + .aa = 1, + .tc = 1, + .rd = 1, + .ra = 1, + .z = 0x02, + .rcode = 0x03, + .qdcount = 1234, + .ancount = 1111, + .nscount = 2222, + .arcount = 3333, + }, +}; + +void test_enc_dec_rfc_header() +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i]; + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_HDR(in, "in"); + osmo_mdns_rfc_header_encode(msg, &in); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0); + PRINT_HDR(out, "out"); + + fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in))); + fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out))); + assert(memcmp(&in, &out, sizeof(in)) == 0); + + fprintf(stderr, "=> OK\n\n"); + msgb_free(msg); + } +} + +void test_enc_dec_rfc_header_einval() +{ + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + fprintf(stderr, "-- %s --\n", __func__); + + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL); + fprintf(stderr, "=> OK\n\n"); + + msgb_free(msg); +} + +#define PRINT_QST(qst, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".qtype = %i\n" \ + ".qclass = %i\n", \ + name, (qst)->domain, (qst)->qtype, (qst)->qclass) + +static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL, + .qclass = OSMO_MDNS_RFC_CLASS_IN, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, +}; + +void test_enc_dec_rfc_question(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i]; + struct osmo_mdns_rfc_question *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_QST(&in, "in"); + assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); + assert(out); + PRINT_QST(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.qtype != out->qtype) + fprintf(stderr, "=> ERROR: qtype does not match\n"); + else if (in.qclass != out->qclass) + fprintf(stderr, "=> ERROR: qclass does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +void test_enc_dec_rfc_question_null(void *ctx) +{ + uint8_t data[5] = {0}; + + fprintf(stderr, "-- %s --\n", __func__); + assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL); + fprintf(stderr, "=> OK\n\n"); +} + +#define PRINT_REC(rec, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".type = %i\n" \ + ".class = %i\n" \ + ".ttl = %i\n" \ + ".rdlength = %i\n" \ + ".rdata = %s\n", \ + name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \ + osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength)) + +static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .type = OSMO_MDNS_RFC_RECORD_TYPE_A, + .class = OSMO_MDNS_RFC_CLASS_IN, + .ttl = 1234, + .rdlength = 9, + .rdata = (uint8_t *)"10.42.2.1", + }, +}; + +void test_enc_dec_rfc_record(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i]; + struct osmo_mdns_rfc_record *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + size_t record_len; + + PRINT_REC(&in, "in"); + assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); + fprintf(stderr, "record_len: %lu\n", record_len); + assert(out); + PRINT_REC(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.type != out->type) + fprintf(stderr, "=> ERROR: type does not match\n"); + else if (in.class != out->class) + fprintf(stderr, "=> ERROR: class does not match\n"); + else if (in.ttl != out->ttl) + fprintf(stderr, "=> ERROR: ttl does not match\n"); + else if (in.rdlength != out->rdlength) + fprintf(stderr, "=> ERROR: rdlength does not match\n"); + else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0) + fprintf(stderr, "=> ERROR: rdata does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +static uint8_t ip_v4_n[] = {23, 42, 47, 11}; +static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, + 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}; + + +enum test_records { + RECORD_NONE, + RECORD_A, + RECORD_AAAA, + RECORD_TXT_AGE, + RECORD_TXT_PORT_444, + RECORD_TXT_PORT_666, + RECORD_TXT_INVALID_KEY, + RECORD_TXT_INVALID_NO_KEY_VALUE, + RECORD_INVALID, +}; +struct result_from_answer_test { + const char *desc; + const enum test_records records[5]; + bool error; + const struct osmo_mslookup_result res; +}; + +static void test_result_from_answer(void *ctx) +{ + void *print_ctx = talloc_named_const(ctx, 0, __func__); + struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"}; + struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666, + .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"}; + struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4}; + struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v6 = test_host_v6}; + struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4, .host_v6 = test_host_v6}; + struct result_from_answer_test result_from_answer_data[] = { + { + .desc = "IPv4", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444}, + .res = test_result_v4 + }, + { + .desc = "IPv6", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v6 + }, + { + .desc = "IPv4 + IPv6", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v4_v6 + }, + { + .desc = "A twice", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A}, + .error = true + }, + { + .desc = "AAAA twice", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA}, + .error = true + }, + { + .desc = "invalid TXT: no key/value pair", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE}, + .error = true + }, + { + .desc = "age twice", + .records = {RECORD_TXT_AGE, RECORD_TXT_AGE}, + .error = true + }, + { + .desc = "port as first record", + .records = {RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "port without previous ip record", + .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "invalid TXT: invalid key", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY}, + .error = true + }, + { + .desc = "unexpected record type", + .records = {RECORD_TXT_AGE, RECORD_INVALID}, + .error = true + }, + { + .desc = "missing record: age", + .records = {RECORD_A, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "missing record: port for ipv4", + .records = {RECORD_TXT_AGE, RECORD_A}, + .error = true + }, + { + .desc = "missing record: port for ipv4 #2", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A}, + .error = true + }, + }; + int i = 0; + int j = 0; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) { + struct result_from_answer_test *t = &result_from_answer_data[i]; + struct osmo_mdns_msg_answer ans = {0}; + struct osmo_mslookup_result res = {0}; + void *ctx_test = talloc_named_const(ctx, 0, t->desc); + bool is_error; + + fprintf(stderr, "---\n"); + fprintf(stderr, "test: %s\n", t->desc); + fprintf(stderr, "error: %s\n", t->error ? "true" : "false"); + fprintf(stderr, "records:\n"); + /* Build records list */ + INIT_LLIST_HEAD(&ans.records); + for (j = 0; j < ARRAY_SIZE(t->records); j++) { + struct osmo_mdns_record *rec = NULL; + + switch (t->records[j]) { + case RECORD_NONE: + break; + case RECORD_A: + fprintf(stderr, "- A 42.42.42.42\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec->data = ip_v4_n; + rec->length = sizeof(ip_v4_n); + break; + case RECORD_AAAA: + fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec->data = ip_v6_n; + rec->length = sizeof(ip_v6_n); + break; + case RECORD_TXT_AGE: + fprintf(stderr, "- TXT age=3\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3"); + break; + case RECORD_TXT_PORT_444: + fprintf(stderr, "- TXT port=444\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444"); + break; + case RECORD_TXT_PORT_666: + fprintf(stderr, "- TXT port=666\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666"); + break; + case RECORD_TXT_INVALID_KEY: + fprintf(stderr, "- TXT hello=world\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world"); + break; + case RECORD_TXT_INVALID_NO_KEY_VALUE: + fprintf(stderr, "- TXT 12345\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45"); + rec->data[3] = '3'; + break; + case RECORD_INVALID: + fprintf(stderr, "- (invalid)\n"); + rec = talloc_zero(ctx, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN; + break; + } + + if (rec) + llist_add_tail(&rec->list, &ans.records); + } + + /* Verify output */ + is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0); + if (t->error != is_error) { + fprintf(stderr, "got %s\n", is_error ? "error" : "no error"); + OSMO_ASSERT(false); + } + if (!t->error) { + fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res)); + fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res)); + OSMO_ASSERT(t->res.rc == res.rc); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4)); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6)); + OSMO_ASSERT(t->res.age == res.age); + OSMO_ASSERT(t->res.last == res.last); + } + + talloc_free(ctx_test); + fprintf(stderr, "=> OK\n"); + } +} + +int main() +{ + void *ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + + test_enc_dec_rfc_qname(ctx); + test_enc_dec_rfc_header(); + test_enc_dec_rfc_header_einval(); + test_enc_dec_rfc_question(ctx); + test_enc_dec_rfc_question_null(ctx); + test_enc_dec_rfc_record(ctx); + + test_result_from_answer(ctx); + + return 0; +} diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err new file mode 100644 index 0000000..51e5afe --- /dev/null +++ b/tests/mslookup/mdns_test.err @@ -0,0 +1,336 @@ +-- test_enc_dec_rfc_qname -- +domain: "hlr.1234567.imsi" +exp: "\3hlr\a1234567\4imsi" +res: "\3hlr\a1234567\4imsi" +=> OK + +qname: "\3hlr\a1234567\4imsi" +exp: "hlr.1234567.imsi" +res: "hlr.1234567.imsi" +=> OK + +domain: "hlr..imsi" +exp: NULL +res: NULL +=> OK + +domain: "hlr" +exp: "\3hlr" +res: "\3hlr" +=> OK + +qname: "\3hlr" +exp: "hlr" +res: "hlr" +=> OK + +domain: "hlr." +exp: NULL +res: NULL +=> OK + +domain: ".hlr" +exp: NULL +res: NULL +=> OK + +domain: "" +exp: NULL +res: NULL +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" +exp: NULL +res: NULL +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\a1234567\5imsi" +exp: NULL +res: NULL +=> OK + +qname: "\2hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\3" +exp: NULL +res: NULL +=> OK + +qname_max_len: 17 +qname: "\3hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +-- test_enc_dec_rfc_header -- +header in: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +encoded: 05 39 00 00 00 01 00 00 00 00 00 00 +header out: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +=> OK + +header in: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 +header out: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +=> OK + +-- test_enc_dec_rfc_header_einval -- +=> OK + +-- test_enc_dec_rfc_question -- +question in: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 +question out: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +=> OK + +-- test_enc_dec_rfc_question_null -- +=> OK + +-- test_enc_dec_rfc_record -- +question in: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 +record_len: 37 +question out: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +=> OK + +-- test_result_from_answer -- +--- +test: IPv4 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +=> OK +--- +test: IPv6 +error: false +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: IPv4 + IPv6 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: A twice +error: true +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- A 42.42.42.42 +DLGLOBAL ERROR 'A' record found twice in mDNS answer +=> OK +--- +test: AAAA twice +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer +=> OK +--- +test: invalid TXT: no key/value pair +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT 12345 +DLGLOBAL ERROR failed to decode txt record +=> OK +--- +test: age twice +error: true +records: +- TXT age=3 +- TXT age=3 +DLGLOBAL ERROR duplicate 'TXT' record for 'age' +=> OK +--- +test: port as first record +error: true +records: +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: port without previous ip record +error: true +records: +- TXT age=3 +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: invalid TXT: invalid key +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT hello=world +DLGLOBAL ERROR unexpected key 'hello' in TXT record +=> OK +--- +test: unexpected record type +error: true +records: +- TXT age=3 +- (invalid) +DLGLOBAL ERROR unexpected record type +=> OK +--- +test: missing record: age +error: true +records: +- A 42.42.42.42 +- TXT port=444 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 +error: true +records: +- TXT age=3 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 #2 +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c new file mode 100644 index 0000000..f33ef98 --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -0,0 +1,255 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void *ctx = NULL; + +#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4 +#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT +#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org" + +/* + * Test server (emulates the mDNS server in OsmoHLR) and client + */ +struct osmo_mdns_sock *server_mc; + + +static void server_reply(struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mslookup_result result = {0}; + struct msgb *msg; + + result.rc = OSMO_MSLOOKUP_RC_RESULT; + result.age = 3; + osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444); + osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666); + + msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(msg); + OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 0); +} + +static int server_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + int n; + uint8_t buffer[1024]; + uint16_t packet_id; + struct osmo_mslookup_query *query; + + fprintf(stderr, "%s\n", __func__); + + /* Parse the message and print it */ + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + OSMO_ASSERT(n >= 0); + + query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX); + if (!query) + return -1; /* server receiving own answer is expected */ + + fprintf(stderr, "received request\n"); + server_reply(query, packet_id); + talloc_free(query); + return n; +} + +static void server_init() +{ + fprintf(stderr, "%s\n", __func__); + server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0); + OSMO_ASSERT(server_mc); +} + +static void server_stop() +{ + fprintf(stderr, "%s\n", __func__); + OSMO_ASSERT(server_mc); + osmo_mdns_sock_cleanup(server_mc); + server_mc = NULL; +} + +struct osmo_mslookup_client* client; +struct osmo_mslookup_client_method* client_method; + +static void client_init() +{ + fprintf(stderr, "%s\n", __func__); + client = osmo_mslookup_client_new(ctx); + OSMO_ASSERT(client); + client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(client_method); +} + +static void client_recv(struct osmo_mslookup_client *client, uint32_t request_handle, + const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result) +{ + char buf[256]; + fprintf(stderr, "%s\n", __func__); + fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + + osmo_mslookup_client_request_cancel(client, request_handle); +} + +static void client_query() +{ + struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI, + .imsi = "123456789012345"}; + const struct osmo_mslookup_query query = { + .service = "gsup.hlr", + .id = id, + }; + struct osmo_mslookup_query_handling handling = { + .result_timeout_milliseconds = 2000, + .result_cb = client_recv, + }; + + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_request(client, &query, &handling); +} + +static void client_stop() +{ + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_free(client); + client = NULL; +} +const struct timeval fake_time_start_time = { 0, 0 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +static void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} +static void test_server_client() +{ + fprintf(stderr, "-- %s --\n", __func__); + server_init(); + client_init(); + client_query(); + + /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and + * port, the client will also receive its own question. The client will dismiss its own question, as it is just + * looking for answers. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback + * (client_recv()) just yet, because it is waiting for the best result within two seconds. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Time flies by, client_recv() gets called. */ + fake_time_passes(5, 0); + + server_stop(); + client_stop(); +} + +bool is_multicast_enabled() +{ + bool ret = true; + struct addrinfo *ai; + int sock; + struct addrinfo hints = {0}; + struct ip_mreq multicast_req = {0}; + in_addr_t iface = INADDR_ANY; + + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); + assert(getaddrinfo("239.192.23.42", "4266", &hints, &ai) == 0); + + sock = socket(ai->ai_family, ai->ai_socktype, 0); + assert(sock != -1); + assert(setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)) != -1); + + memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ai->ai_addr))->sin_addr, + sizeof(multicast_req.imr_multiaddr)); + multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); + + if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)) == -1) + ret = false; + + freeaddrinfo(ai); + return ret; +} + +/* + * Run all tests + */ +int main() +{ + if (!is_multicast_enabled()) { + fprintf(stderr, "WARNING: multicast is disabled, skipping the test! (OS#4361)"); + return 77; + } + + talloc_enable_null_tracking(); + ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); + + fake_time_start(); + + test_server_client(); + + log_fini(); + + OSMO_ASSERT(talloc_total_blocks(ctx) == 1); + talloc_free(ctx); + OSMO_ASSERT(talloc_total_blocks(NULL) == 1); + talloc_disable_null_tracking(); + + return 0; +} diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err new file mode 100644 index 0000000..b4ea269 --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.err @@ -0,0 +1,14 @@ +Total time passed: 0.000000 s +-- test_server_client -- +server_init +client_init +client_query +sending mDNS query: gsup.hlr.123456789012345.imsi +server_recv +received request +server_recv +client_recv +client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +Total time passed: 5.000000 s +server_stop +client_stop diff --git a/tests/testsuite.at b/tests/testsuite.at index 39df7aa..827e9f8 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -40,6 +40,12 @@ AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([mdns]) +AT_KEYWORDS([mdns]) +cat $abs_srcdir/mslookup/mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr]) +AT_CLEANUP + AT_SETUP([mslookup]) AT_KEYWORDS([mslookup]) cat $abs_srcdir/mslookup/mslookup_test.err > experr @@ -51,3 +57,9 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP + +AT_SETUP([mslookup_client_mdns]) +AT_KEYWORDS([mslookup_client_mdns]) +cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3c340627181b632dd6a0d577aa2ea2a7cd035c0c Gerrit-Change-Number: 16835 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:12:13 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 13:12:13 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program (#2) References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16836 ) Change subject: add osmo-mslookup-client program (#2) ...................................................................... add osmo-mslookup-client program (#2) Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Resubmit of 637bbfcd9275f8c47212b29b50110f56ba6397bf after revert in 41fe3625915c456513544b99ba8c057c0f650b3c. Change-Id: Ie39d30e20461ab10ae3584863d8bfc6b76a12f37 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 957 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/36/16836/1 diff --git a/.gitignore b/.gitignore index eec364a..0965935 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ src/osmo-hlr-db-tool src/osmo-euse-demo src/gsupclient/gsup-test-client +src/mslookup/osmo-mslookup-client tests/atconfig tests/testsuite diff --git a/configure.ac b/configure.ac index 57aecba..59261e8 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/dgsm/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3439c97..cfd0b15 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1,4 @@ -SUBDIRS = systemd +SUBDIRS = \ + systemd \ + dgsm \ + $(NULL) diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am new file mode 100644 index 0000000..c759302 --- /dev/null +++ b/contrib/dgsm/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + osmo-mslookup-pipe.py \ + osmo-mslookup-socket.py \ + $(NULL) diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py new file mode 100755 index 0000000..b18bf5f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-pipe.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import subprocess +import json + +def query_mslookup(query_str): + result = {'result': 'not-found'} + proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str), + stdout=subprocess.PIPE) + for line in iter(proc.stdout.readline,''): + if not line: + break + response = json.loads(line) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup(query_str)) diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py new file mode 100755 index 0000000..a26ad9f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-socket.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import socket +import time + +MSLOOKUP_SOCKET_PATH = '/tmp/mslookup' + +def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH): + mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) + mslookup_socket.setblocking(True) + mslookup_socket.connect(socket_path) + result = {'result': 'not-found'} + column_names = mslookup_socket.recv(1024).decode('ascii') + if not column_names: + return result + column_names = column_names.split('\t') + mslookup_socket.sendall(query_str.encode('ascii')) + while True: + csv = mslookup_socket.recv(1024).decode('ascii') + if not csv: + break + response = dict(zip(column_names, csv.split('\t'))) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + print( + '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n') + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup_socket(query_str)) diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 07fb6f4..a720c40 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -26,3 +26,12 @@ $(LIBOSMOGSM_LIBS) \ $(TALLOC_LIBS) \ $(NULL) + +bin_PROGRAMS = osmo-mslookup-client +osmo_mslookup_client_SOURCES = osmo-mslookup-client.c +osmo_mslookup_client_LDADD = \ + libosmo-mslookup.la \ + $(LIBOSMOCORE_LIBS) \ + $(TALLOC_LIBS) \ + $(NULL) +osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c new file mode 100644 index 0000000..1c0efe9 --- /dev/null +++ b/src/mslookup/osmo-mslookup-client.c @@ -0,0 +1,879 @@ +/*! \file osmo-mslookup-client.c + * Distributed GSM: find the location of subscribers, for example by multicast DNS, + * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names). + */ +/* + * (C) 2019 by sysmocom s.f.m.c. GmbH + * (C) 2019 by Neels Hofmeyr + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port" + +static void print_version(void) +{ + printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION); + printf("\n" + "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n" + "Copyright (C) 2019 by Neels Hofmeyr \n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + "\n"); +} + +static void print_help() +{ + print_version(); + printf( +"Standalone mslookup client for Distributed GSM\n" +"\n" +"Receiving mslookup results means listening for responses on a socket. Often,\n" +"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n" +"to read responses, because that interferes with the main program (e.g.\n" +"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n" +"that interferes with osmo_select_main(), or an smpp.py uses\n" +"smpplib.client.listen() as main loop, etc.).\n" +"\n" +"This program provides a trivial solution, by outsourcing the mslookup main loop\n" +"to a separate process. Communication is done via cmdline arg and stdout pipe or\n" +"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n" +"\n" +"This can be done one-shot, i.e. exit as soon as the response has been\n" +"determined, or in daemon form, i.e. continuously listen for requests and return\n" +"responses.\n" +"\n" +"About running a local daemon: it is unintuitive to connect to a socket to solve\n" +"a problem of reading from a socket -- it seems like just more of the same\n" +"problem. The reasons why the daemon is in fact useful are:\n" +"- The osmo-mslookup-client daemon will return only those results matching\n" +" requests issued on that socket connection.\n" +"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n" +" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n" +" to asynchronously receive responses from remote servers.\n" +"- Only one long-lived multicast socket needs to be opened instead of a new\n" +" socket for each request.\n" +"\n" +"Output is in CSV or json, see --format. The default is tab-separated CSV\n" +"with these columns:\n" +CSV_HEADERS "\n" +"\n" +"One-shot operation example:\n" +"$ osmo-mslookup-client 1000- at sip.voice.12345.msisdn -f json\n" +"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n" +"$\n" +"\n" +"Daemon operation example:\n" +"$ osmo-mslookup-client -s /tmp/mslookup -d\n" +"(and a client program then connects to /tmp/mslookup, find an implementation\n" +"example below)\n" +"\n" +"Integrating with calling programs can be done by:\n" +"- call osmo-mslookup-client with the query string as argument.\n" +" It will open a multicast DNS socket, send out a query and wait for the\n" +" matching response. It will print the result on stdout and exit.\n" +" This method launches a new process for every mslookup query,\n" +" and creates a short-lived multicast listener for each invocation.\n" +" This is fine for low activity, but does not scale well.\n" +"\n" +"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n" +" Individual queries can be sent by connecting to that unix domain socket,\n" +" blockingly reading the response when it arrives and disconnecting.\n" +" This way only one process keeps one multicast listener open.\n" +" Callers can connect to this socket without spawning processes.\n" +" This is recommended for scale.\n" +"\n" +"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n" +"\n" +"\n" +"Options:\n" +"\n" +"[[delay-][timeout]@]service.number.id\n" +" A service query string with optional individual timeout.\n" +" The same format is also used on a daemon socket, if any.\n" +" The timeout consists of the min-delay and the timeout numbers,\n" +" corresponding to the --min-delay and --timeout options, in milliseconds.\n" +" These options apply if a query string lacks own numbers.\n" +" Examples:\n" +" gsup.hlr.1234567.imsi Use cmdline timeout settings\n" +" 5000 at gsup.hlr.1234567.imsi Return N results for 5 seconds\n" +" 1000-5000 at sip.voice.123.msisdn Same, but silent for first second\n" +" 10000- at smpp.sms.567.msisdn Return 1 result after 10 seconds\n" +"\n" +"--format -f csv (default)\n" +" Format result lines in CSV format.\n" +"--no-csv-headers -H\n" +" If the format is 'csv', by default, the first output line prints the\n" +" CSV headers used for CSV output format. This option disables these CSV\n" +" headers.\n" +"\n" +"--format -f json\n" +" Format result lines in json instead of semicolon separated, like:\n" +" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n" +"\n" +"--daemon -d\n" +" Keep running after a request has been serviced\n" +"\n" +"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n" +"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n" +" Set multicast IP address / port to send mDNS requests and listen for\n" +" mDNS reponses\n" +"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n" +" Append this suffix to each mDNS query's domain to avoid colliding with the\n" +" top-level domains administrated by IANA.\n" +"\n" +"--min-delay -t 1000 (in milliseconds)\n" +" Set minimum delay to wait before returning any results.\n" +" When this timeout has elapsed, the best current result is returned,\n" +" if any is available.\n" +" Responses arriving after the min-delay has elapsed which have a younger\n" +" age than previous results are returned immediately.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--timeout -T 1000 (in milliseconds)\n" +" Set timeout after which to stop listening for responses.\n" +" If this is smaller than -t, the value from -t will be used for -T as well.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--socket -s /path/to/unix-domain-socket\n" +" Listen to requests from and write responses to a UNIX domain socket.\n" +"\n" +"--send -S \n" +" Do not query, but send an mslookup result. This is useful only for\n" +" testing. Examples:\n" +" --send foo.123.msisdn 300 23.42.17.11 1234\n" +" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n" +" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n" +"\n" +"--quiet -q\n" +" Do not print errors to stderr, do not log to stderr.\n" +"\n" +"--help -h\n" +" This help\n" +); +} + +enum result_format { + FORMAT_CSV = 0, + FORMAT_JSON, +}; + +static struct { + bool daemon; + struct osmo_sockaddr_str mdns_addr; + uint32_t min_delay; + uint32_t timeout; + const char *socket_path; + const char *format_str; + const char *mdns_domain_suffix; + bool csv_headers; + bool send; + bool quiet; +} cmdline_opts = { + .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT }, + .min_delay = 1000, + .timeout = 1000, + .csv_headers = true, + .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT, +}; + +#define print_error(fmt, args...) do { \ + if (!cmdline_opts.quiet) \ + fprintf(stderr, fmt, ##args); \ + } while (0) + +char g_buf[1024]; + +long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc) +{ + long long int val; + char *endptr; + if (rc) + *rc = -1; + if (!arg) + return -1; + errno = 0; + val = strtoll(arg, &endptr, 10); + if (errno || val < minval || val > maxval || *endptr) + return -1; + if (rc) + *rc = 0; + return val; +} + +int cb_doing_nothing(struct osmo_fd *fd, unsigned int what) +{ + return 0; +} + +/* --send: Just send a response, for manual testing. */ +int do_send(int argc, char ** argv) +{ + /* parse args */ +#define ARG(NR) ((argc > NR)? argv[NR] : NULL) + const char *query_str = ARG(0); + const char *age_str = ARG(1); + const char *ip_strs[2][2] = { + { ARG(2), ARG(3) }, + { ARG(4), ARG(5) }, + }; + struct osmo_mslookup_query q = {}; + struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT }; + int i; + int rc; + void *ctx = talloc_named_const(NULL, 0, __func__); + struct osmo_mdns_sock *sock; + + if (!query_str) { + print_error("--send needs a query string like foo.123456.imsi\n"); + return 1; + } + if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) { + print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n", + query_str); + return 1; + } + + if (!age_str) { + print_error("--send needs an age\n"); + return 1; + } + r.age = parse_int(0, UINT32_MAX, age_str, &rc); + if (rc) { + print_error("invalid age\n"); + return 1; + } + + for (i = 0; i < 2; i++) { + struct osmo_sockaddr_str addr; + uint16_t port; + if (!ip_strs[i][0]) + continue; + port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc); + if (rc) { + print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL"); + return 1; + } + if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) { + print_error("invalid IP addr: %s\n", ip_strs[i][0]); + return 1; + } + if (addr.af == AF_INET) + r.host_v4 = addr; + else + r.host_v6 = addr; + } + + printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr), + osmo_mslookup_result_name_c(ctx, &q, &r)); + + rc = 1; + sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + cb_doing_nothing, NULL, 0); + if (!sock) { + print_error("unable to open mDNS socket\n"); + goto exit_cleanup; + } + + struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); + if (!msg) { + print_error("unable to encode mDNS response\n"); + goto exit_cleanup; + } + + if (osmo_mdns_sock_send(sock, msg)) { + print_error("unable to send mDNS message\n"); + goto exit_cleanup; + } + + rc = 0; +exit_cleanup: + osmo_mdns_sock_cleanup(sock); + talloc_free(ctx); + return rc; +} + +static struct { + void *ctx; + unsigned int requests_handled; + struct osmo_fd socket_ofd; + struct osmo_mslookup_client *mslookup_client; + struct llist_head queries; + struct llist_head socket_clients; + enum result_format format; +} globals = { + .queries = LLIST_HEAD_INIT(globals.queries), + .socket_clients = LLIST_HEAD_INIT(globals.socket_clients), +}; + +typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r); + +void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "%s", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t"); + else { + OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last"); + OSMO_STRBUF_PRINTF(sb, "\t%u", r->age); + switch (r->rc) { + case OSMO_MSLOOKUP_RC_RESULT: + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + break; + default: + OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t"); + break; + } + } +} + +void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\""); + else { + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false"); + OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age); + if (r->rc == OSMO_MSLOOKUP_RC_RESULT) { + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port); + } + } + OSMO_STRBUF_PRINTF(sb, "}"); +} + +formatter_t formatters[] = { + [FORMAT_CSV] = formatter_csv, + [FORMAT_JSON] = formatter_json, +}; + +void respond_str_stdout(const char *str) { + fprintf(stdout, "%s\n", str); + fflush(stdout); +} + +void start_query_str(const char *query_str); +void start_query_strs(char **query_strs, size_t query_strs_len); + +struct socket_client { + struct llist_head entry; + struct osmo_fd ofd; + char query_str[1024]; +}; + +static void socket_client_close(struct socket_client *c) +{ + struct osmo_fd *ofd = &c->ofd; + + close(ofd->fd); + ofd->fd = -1; + osmo_fd_unregister(ofd); + + llist_del(&c->entry); + talloc_free(c); +} + +void socket_client_respond_result(struct socket_client *c, const char *response) +{ + write(c->ofd.fd, response, strlen(response)); +} + +static int socket_read_cb(struct osmo_fd *ofd) +{ + struct socket_client *c = ofd->data; + int rc; + char rxbuf[1024]; + char *query_with_timeout; + char *query_str; + char *at; + + rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0); + if (rc == 0) + goto close; + + if (rc < 0) { + if (errno == EAGAIN) + return 0; + goto close; + } + + if (rc >= sizeof(c->query_str)) + goto close; + + rxbuf[rc] = '\0'; + query_with_timeout = strtok(rxbuf, "\r\n"); + at = strchr(query_with_timeout, '@'); + query_str = at ? at + 1 : query_with_timeout; + + if (c->query_str[0]) { + print_error("ERROR: Only one query per client connect is allowed;" + " received '%s' and '%s' on the same connection\n", + c->query_str, query_str); + formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL); + socket_client_respond_result(c, g_buf); + return 0; + } + + OSMO_STRLCPY_ARRAY(c->query_str, query_str); + start_query_str(query_with_timeout); + printf("query: %s\n", query_with_timeout); + return rc; + +close: + socket_client_close(c); + return -1; +} + +static int socket_cb(struct osmo_fd *ofd, unsigned int flags) +{ + int rc = 0; + + if (flags & BSC_FD_READ) + rc = socket_read_cb(ofd); + if (rc < 0) + return rc; + + return rc; +} + +int socket_accept(struct osmo_fd *ofd, unsigned int flags) +{ + struct socket_client *c; + struct sockaddr_un un_addr; + socklen_t len; + int rc; + + len = sizeof(un_addr); + rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len); + if (rc < 0) { + print_error("Failed to accept a new connection\n"); + return -1; + } + + c = talloc_zero(globals.ctx, struct socket_client); + OSMO_ASSERT(c); + c->ofd.fd = rc; + c->ofd.when = BSC_FD_READ; + c->ofd.cb = socket_cb; + c->ofd.data = c; + + if (osmo_fd_register(&c->ofd) != 0) { + print_error("Failed to register new connection fd\n"); + close(c->ofd.fd); + c->ofd.fd = -1; + talloc_free(c); + return -1; + } + + llist_add(&c->entry, &globals.socket_clients); + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); + + return 0; +} + +int socket_init(const char *sock_path) +{ + struct osmo_fd *ofd = &globals.socket_ofd; + int rc; + + ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND); + if (ofd->fd < 0) { + print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno)); + return -1; + } + + ofd->when = BSC_FD_READ; + ofd->cb = socket_accept; + + rc = osmo_fd_register(ofd); + if (rc < 0) { + print_error("Could not register listen fd: %d\n", rc); + close(ofd->fd); + return rc; + } + return 0; +} + +void socket_close() +{ + struct socket_client *c, *n; + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) + socket_client_close(c); + if (osmo_fd_is_registered(&globals.socket_ofd)) { + close(globals.socket_ofd.fd); + globals.socket_ofd.fd = -1; + osmo_fd_unregister(&globals.socket_ofd); + } +} + +struct query { + struct llist_head entry; + + char query_str[128]; + struct osmo_mslookup_query query; + uint32_t handle; +}; + +void respond_result(const char *query_str, const struct osmo_mslookup_result *r) +{ + struct socket_client *c, *n; + formatters[globals.format](g_buf, sizeof(g_buf), query_str, r); + respond_str_stdout(g_buf); + + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) { + if (!strcmp(query_str, c->query_str)) { + socket_client_respond_result(c, g_buf); + if (r->last) + socket_client_close(c); + } + } + if (r->last) + globals.requests_handled++; +} + +void respond_err(const char *query_str) +{ + respond_result(query_str, NULL); +} + +struct query *query_by_handle(uint32_t request_handle) +{ + struct query *q; + llist_for_each_entry(q, &globals.queries, entry) { + if (request_handle == q->handle) + return q; + } + return NULL; +} + +void mslookup_result_cb(struct osmo_mslookup_client *client, + uint32_t request_handle, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + struct query *q = query_by_handle(request_handle); + if (!q) + return; + respond_result(q->query_str, result); + if (result->last) { + llist_del(&q->entry); + talloc_free(q); + } +} + +void start_query_str(const char *query_str) +{ + struct query *q; + const char *domain_str = query_str; + char *at; + struct osmo_mslookup_query_handling h = { + .min_wait_milliseconds = cmdline_opts.min_delay, + .result_timeout_milliseconds = cmdline_opts.timeout, + .result_cb = mslookup_result_cb, + }; + + at = strchr(query_str, '@'); + if (at) { + int rc; + char timeouts[16]; + char *dash; + char *timeout; + + domain_str = at + 1; + + h.min_wait_milliseconds = h.result_timeout_milliseconds = 0; + + if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) { + print_error("ERROR: timeouts part too long in query string\n"); + respond_err(domain_str); + return; + } + + dash = strchr(timeouts, '-'); + if (dash) { + char min_delay[16]; + osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts); + h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc); + if (rc) { + print_error("ERROR: invalid min-delay number: %s\n", min_delay); + respond_err(domain_str); + return; + } + timeout = dash + 1; + } else { + timeout = timeouts; + } + if (*timeout) { + h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc); + if (rc) { + print_error("ERROR: invalid timeout number: %s\n", timeout); + respond_err(domain_str); + return; + } + } + } + + if (strlen(domain_str) >= sizeof(q->query_str)) { + print_error("ERROR: query string is too long: '%s'\n", domain_str); + respond_err(domain_str); + return; + } + + q = talloc_zero(globals.ctx, struct query); + OSMO_ASSERT(q); + OSMO_STRLCPY_ARRAY(q->query_str, domain_str); + + if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) { + print_error("ERROR: cannot parse query string: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h); + if (!q->handle) { + print_error("ERROR: cannot send query: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + llist_add(&q->entry, &globals.queries); +} + +void start_query_strs(char **query_strs, size_t query_strs_len) +{ + int i; + for (i = 0; i < query_strs_len; i++) + start_query_str(query_strs[i]); +} + +int main(int argc, char **argv) +{ + int rc = EXIT_FAILURE; + globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client"); + + osmo_init_logging2(globals.ctx, NULL); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_extended_timestamp(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + while (1) { + int c; + long long int val; + char *endptr; + int option_index = 0; + + static struct option long_options[] = { + { "format", 1, 0, 'f' }, + { "no-csv-headers", 0, 0, 'H' }, + { "daemon", 0, 0, 'd' }, + { "mdns-ip", 1, 0, 'm' }, + { "mdns-port", 1, 0, 'M' }, + { "mdns-domain-suffix", 1, 0, 'D' }, + { "timeout", 1, 0, 'T' }, + { "min-delay", 1, 0, 't' }, + { "socket", 1, 0, 's' }, + { "send", 0, 0, 'S' }, + { "quiet", 0, 0, 'q' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + {} + }; + +#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \ + int _rc; \ + TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \ + if (_rc) { \ + print_error("Invalid " #TARGET ": %s\n", optarg); \ + goto program_exit; \ + } \ + } while (0) + + c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index); + + if (c == -1) + break; + + switch (c) { + case 'f': + cmdline_opts.format_str = optarg; + break; + case 'H': + cmdline_opts.csv_headers = false; + break; + case 'd': + cmdline_opts.daemon = true; + break; + case 'm': + if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port) + || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) { + print_error("Invalid mDNS IP address: %s\n", optarg); + goto program_exit; + } + break; + case 'M': + PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535); + break; + case 'D': + cmdline_opts.mdns_domain_suffix = optarg; + break; + case 't': + PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX); + break; + case 'T': + PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX); + break; + case 's': + cmdline_opts.socket_path = optarg; + break; + case 'S': + cmdline_opts.send = true; + break; + case 'q': + cmdline_opts.quiet = true; + break; + + case 'h': + print_help(); + rc = 0; + goto program_exit; + case 'V': + print_version(); + rc = 0; + goto program_exit; + + default: + /* catch unknown options *as well as* missing arguments. */ + print_error("Error in command line options. Exiting.\n"); + goto program_exit; + } + } + + if (cmdline_opts.send) { + if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) { + print_error("--send option cannot have any listening related args."); + } + rc = do_send(argc - optind, argv + optind); + goto program_exit; + } + + if (!cmdline_opts.daemon && !(argc - optind)) { + print_help(); + goto program_exit; + } + + if (cmdline_opts.daemon && !cmdline_opts.timeout) { + print_error("In daemon mode, --timeout must not be zero.\n"); + goto program_exit; + } + + if (cmdline_opts.quiet) + log_target_destroy(osmo_stderr_target); + + if (cmdline_opts.format_str) { + if (osmo_str_startswith("json", cmdline_opts.format_str)) + globals.format = FORMAT_JSON; + else if (osmo_str_startswith("csv", cmdline_opts.format_str)) + globals.format = FORMAT_CSV; + else { + print_error("Invalid format: %s\n", cmdline_opts.format_str); + goto program_exit; + } + } + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + respond_str_stdout(CSV_HEADERS); + + globals.mslookup_client = osmo_mslookup_client_new(globals.ctx); + if (!globals.mslookup_client + || !osmo_mslookup_client_add_mdns(globals.mslookup_client, + cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + -1, cmdline_opts.mdns_domain_suffix)) { + print_error("Failed to start mDNS client\n"); + goto program_exit; + } + + if (cmdline_opts.socket_path) { + if (socket_init(cmdline_opts.socket_path)) + goto program_exit; + } + + start_query_strs(&argv[optind], argc - optind); + + while (1) { + osmo_select_main_ctx(0); + + if (!cmdline_opts.daemon + && globals.requests_handled + && llist_empty(&globals.queries)) + break; + } + + rc = 0; +program_exit: + osmo_mslookup_client_free(globals.mslookup_client); + socket_close(); + log_fini(); + talloc_free(globals.ctx); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie39d30e20461ab10ae3584863d8bfc6b76a12f37 Gerrit-Change-Number: 16836 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:22:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:22:45 +0000 Subject: Change in osmo-hlr[master]: Makefile.am: fix pkgconfig_DATA In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16834 ) Change subject: Makefile.am: fix pkgconfig_DATA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib0bce2d09b41834f7331969eaf7c57a9787f7efb Gerrit-Change-Number: 16834 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 13:22:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:22:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:22:49 +0000 Subject: Change in osmo-hlr[master]: Makefile.am: fix pkgconfig_DATA In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16834 ) Change subject: Makefile.am: fix pkgconfig_DATA ...................................................................... Makefile.am: fix pkgconfig_DATA Fix building debian packages: dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/libosmo-mslookup.pc" (tried in "." and "debian/tmp") dh_install: libosmo-mslookup-dev missing files: usr/lib/*/pkgconfig/libosmo-mslookup.pc dh_install: missing files, aborting Fixes: bf7deda0fc30 ("add libosmo-mslookup abstract client") Change-Id: Ib0bce2d09b41834f7331969eaf7c57a9787f7efb --- M Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index a612bf4..a54dcb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,8 @@ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-gsup-client.pc +pkgconfig_DATA = libosmo-gsup-client.pc \ + libosmo-mslookup.pc @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib0bce2d09b41834f7331969eaf7c57a9787f7efb Gerrit-Change-Number: 16834 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:23:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:23:06 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup (#2) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16835 ) Change subject: add mDNS lookup method to libosmo-mslookup (#2) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3c340627181b632dd6a0d577aa2ea2a7cd035c0c Gerrit-Change-Number: 16835 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Jan 2020 13:23:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:23:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:23:13 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program (#2) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16836 ) Change subject: add osmo-mslookup-client program (#2) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie39d30e20461ab10ae3584863d8bfc6b76a12f37 Gerrit-Change-Number: 16836 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Jan 2020 13:23:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:24:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update most of our dependencies to upstream In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 ) Change subject: deps/Makefile: Update most of our dependencies to upstream ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 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: If5bd3d567de40ec2f72cdf63499435ac0bb4047e Gerrit-Change-Number: 16816 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 13:24:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:24:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:24:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update most of our dependencies to upstream In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 ) Change subject: deps/Makefile: Update most of our dependencies to upstream ...................................................................... deps/Makefile: Update most of our dependencies to upstream Upstream TITAN repositories have almost no actual code changes. However, they did switch to MPLv2, and they did update documentation from word documents to asciidoc. Change-Id: If5bd3d567de40ec2f72cdf63499435ac0bb4047e --- M deps/Makefile 1 file changed, 37 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index ec60d45..012b925 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -75,53 +75,53 @@ # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. # In order to keep local changes in the repository of a dependency, set its commit to the # name of a local branch here (e.g. 'master'). -titan.Libraries.TCCUsefulFunctions_commit= R.30.A +titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea -titan.ProtocolEmulations.SCCP_commit= 9e70fba95bb3dfaf09f5f8260177401ef4cceda7 -titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A -titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A +titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba +titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 +titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 titan.ProtocolModules.BSSMAP_commit= master -titan.ProtocolModules.GRE_commit= R.2.A -titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A -titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A -titan.ProtocolModules.ICMP_commit= R.2.A -titan.ProtocolModules.ICMPv6_commit= R.2.A -titan.ProtocolModules.IP_commit= R.10.B-1-g99d0ec9 -titan.ProtocolModules.ISUP_Q.762_commit= R.8.A +titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446 +titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A-5-ge120ace +titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A-5-g85cb124 +titan.ProtocolModules.ICMP_commit= e49d9fb9f7de637b4bf4803dc6b6e911a8661640 +titan.ProtocolModules.ICMPv6_commit= 46f4d9b6e1e3c794294a92588401a81e4881dd27 +titan.ProtocolModules.IP_commit= 1be86705f39ae38f3c04b2109806ee20d25e91d0 +titan.ProtocolModules.ISUP_Q.762_commit= R.8.A-5-g42d428b titan.ProtocolModules.JSON_v07_2006_commit= R.1.A -titan.ProtocolModules.L2TP_commit= R.2.A +titan.ProtocolModules.L2TP_commit= 17e76d3662bd0bb815158e8a9de1ec413f21b530 titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248d titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d -titan.ProtocolModules.M2PA_commit= R.2.A +titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A -titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= 2ba853c7d197f7f39d97b76fca4726a7143fb4ad -titan.ProtocolModules.NS_v7.3.0_commit= R.2.A -titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.MobileL3_v13.4.0_commit= 2b5149e158e8077a7b9cf431b0c6b635f874c63b +titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c +titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 +titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a titan.ProtocolModules.DIAMETER_ProtocolModule_Generator_commit= ffd939595a08da1b8c8176aaa1f8578bfe02a912 -titan.ProtocolModules.ROSE_commit= R.1.C -titan.ProtocolModules.SCTP_commit= R.2.A -titan.ProtocolModules.SGsAP_13.2.0_commit= 5ccaeab7b3093e2bd8e88eee73c8362d1a2e4f32 -titan.ProtocolModules.SDP_commit= R.14.A -titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 -titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A -titan.ProtocolModules.SUA_commit= R.5.A -titan.ProtocolModules.TCP_commit= R.3.A -titan.ProtocolModules.UDP_commit= R.4.A -titan.TestPorts.Common_Components.Socket-API_commit= R.6.A -titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B -titan.TestPorts.GPIO_commit= R.3.A -titan.TestPorts.HTTPmsg_commit= R.9.B -titan.TestPorts.IPL4asp_commit= R.29.A -titan.TestPorts.LANL2asp_commit= R.8.B +titan.ProtocolModules.ROSE_commit= R.1.C-5-g0f6774c +titan.ProtocolModules.SCTP_commit= R.2.A-5-g556ef3f +titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B-3-g5ccaeab +titan.ProtocolModules.SDP_commit= R.14.A-6-g7f00ea0 +titan.ProtocolModules.SMPP_commit= R.2.A-5-gf2c9017 +titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A-5-gd0f0ce6 +titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a +titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 +titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 +titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-5-g86b7d7f +titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 +titan.TestPorts.GPIO_commit= R.2.A-8-g9728492 +titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde +titan.TestPorts.IPL4asp_commit= R.30.C-3-g24f0681 +titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265 titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 -titan.TestPorts.PCAPasp_commit= R.7.A +titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 -titan.TestPorts.TCPasp_commit= R.9.A -titan.TestPorts.TELNETasp_commit= R.9.A -titan.TestPorts.UDPasp_commit= R.8.A -titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-4-gbacd73d +titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 +titan.TestPorts.TELNETasp_commit= R.9.A-3-g62f281b +titan.TestPorts.UDPasp_commit= R.8.B-3-gbf5e87b +titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-8-g7ec4fe0 titan.TestPorts.USB_commit= master all: $(foreach dir,$(ALL_REPOS),$(dir)/update) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16816 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: If5bd3d567de40ec2f72cdf63499435ac0bb4047e Gerrit-Change-Number: 16816 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:24:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:24:40 +0000 Subject: Change in osmo-remsim[master]: require minimum version 1.3.0 of libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16829 ) Change subject: require minimum version 1.3.0 of libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Gerrit-Change-Number: 16829 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jan 2020 13:24:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:24:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:24:44 +0000 Subject: Change in osmo-remsim[master]: require minimum version 1.3.0 of libosmocore In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16829 ) Change subject: require minimum version 1.3.0 of libosmocore ...................................................................... require minimum version 1.3.0 of libosmocore Finally, a libosmocore version with per-thread select loop fd sets has been released, so we can update our version requirement here. Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Closes: OS#4250 --- M configure.ac M debian/control 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index d041c1a..31af887 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_CHECK_LIB(csv, csv_init, LIBS="$LIBS -lcsv", [AC_MSG_ERROR([*** libcsv library not found!])]) AC_CHECK_HEADERS([csv.h]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) diff --git a/debian/control b/debian/control index e7f52f3..14c5d7a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ pkg-config, osmo-gsm-manuals-dev, libcsv-dev, - libosmocore-dev, + libosmocore-dev (>= 1.3.0), libosmo-abis-dev, libosmo-simtrace2-dev, libpcsclite-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic2654b18fd1f00aa4c1ab01892ecaa48ad2ba29f Gerrit-Change-Number: 16829 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:25:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:25:57 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 13:25:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:26:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:26:06 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup (#2) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16835 ) Change subject: add mDNS lookup method to libosmo-mslookup (#2) ...................................................................... add mDNS lookup method to libosmo-mslookup (#2) Add the first actually useful lookup method to the mslookup library: multicast DNS. The server side is added in a subsequent commit, when the mslookup server is implemented for the osmo-hlr program. Use custom DNS encoding instead of libc-ares (which we use in OsmoSGSN already), because libc-ares is only a DNS client implementation and we will need both client and server. Resubmit of f10463c5fc6d9e786ab7c648d99f7450f9a25906 after being reverted in 110a49f69f29fed844d8743b76fd748f4a14812a. This new version skips the mslookup_client_mdns test if multicast is not supported in the build environment. I have verified that it doesn't break the build anymore in my own OBS namespace. Related: OS#4237, OS#4361 Patch-by: osmith, nhofmeyr Change-Id: I3c340627181b632dd6a0d577aa2ea2a7cd035c0c --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am A include/osmocom/mslookup/Makefile.am A include/osmocom/mslookup/mdns.h A include/osmocom/mslookup/mdns_msg.h A include/osmocom/mslookup/mdns_rfc.h A include/osmocom/mslookup/mdns_sock.h A include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am A src/mslookup/mdns.c A src/mslookup/mdns_msg.c A src/mslookup/mdns_rfc.c A src/mslookup/mdns_sock.c A src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am A tests/mslookup/mdns_test.c A tests/mslookup/mdns_test.err A tests/mslookup/mslookup_client_mdns_test.c A tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 2,864 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index acfea84..eec364a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,8 @@ tests/db/db_test tests/hlr_vty_test.db* tests/db_upgrade/*.dump +tests/mslookup/mdns_test +tests/mslookup/mslookup_client_mdns_test tests/mslookup/mslookup_client_test tests/mslookup/mslookup_test diff --git a/configure.ac b/configure.ac index 217df9f..57aecba 100644 --- a/configure.ac +++ b/configure.ac @@ -178,6 +178,7 @@ include/Makefile include/osmocom/Makefile include/osmocom/hlr/Makefile + include/osmocom/mslookup/Makefile libosmo-gsup-client.pc libosmo-mslookup.pc sql/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index e9a7126..9827950 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,10 @@ nobase_include_HEADERS = \ osmocom/gsupclient/gsup_client.h \ + osmocom/mslookup/mdns.h \ + osmocom/mslookup/mdns_sock.h \ osmocom/mslookup/mslookup_client_fake.h \ osmocom/mslookup/mslookup_client.h \ + osmocom/mslookup/mslookup_client_mdns.h \ osmocom/mslookup/mslookup.h \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index dbc2344..b75c86a 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ hlr \ + mslookup \ $(NULL) diff --git a/include/osmocom/mslookup/Makefile.am b/include/osmocom/mslookup/Makefile.am new file mode 100644 index 0000000..72ccd94 --- /dev/null +++ b/include/osmocom/mslookup/Makefile.am @@ -0,0 +1,6 @@ +# most headers here are installed, see /include/Makefile.am + +noinst_HEADERS = \ + mdns_msg.h \ + mdns_rfc.h \ + $(NULL) diff --git a/include/osmocom/mslookup/mdns.h b/include/osmocom/mslookup/mdns.h new file mode 100644 index 0000000..b62e95f --- /dev/null +++ b/include/osmocom/mslookup/mdns.h @@ -0,0 +1,39 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/*! \file mdns.h */ + +#pragma once + +#include +#include + +#define OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "mdns.osmocom.org" + +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix); + +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix); + +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix); + +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix); diff --git a/include/osmocom/mslookup/mdns_msg.h b/include/osmocom/mslookup/mdns_msg.h new file mode 100644 index 0000000..ae7dd17 --- /dev/null +++ b/include/osmocom/mslookup/mdns_msg.h @@ -0,0 +1,54 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include "mdns_rfc.h" + +struct osmo_mdns_record { + struct llist_head list; + enum osmo_mdns_rfc_record_type type; + uint16_t length; + uint8_t *data; +}; + +struct osmo_mdns_msg_request { + uint16_t id; + char *domain; + enum osmo_mdns_rfc_record_type type; +}; + +struct osmo_mdns_msg_answer { + uint16_t id; + char *domain; + /*! list of osmo_mdns_record. */ + struct llist_head records; +}; + +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req); +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len); + +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *answer); +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans); +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len); +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans); + +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...); +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size); diff --git a/include/osmocom/mslookup/mdns_rfc.h b/include/osmocom/mslookup/mdns_rfc.h new file mode 100644 index 0000000..9d6be5a --- /dev/null +++ b/include/osmocom/mslookup/mdns_rfc.h @@ -0,0 +1,113 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include + +/* RFC 1035 2.3.4 */ +#define OSMO_MDNS_RFC_MAX_NAME_LEN 255 + +/* RFC 1035 3.3 */ +#define OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN 256 + +enum osmo_mdns_rfc_record_type { + OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN = 0, + + /* RFC 1035 3.2.2 */ + OSMO_MDNS_RFC_RECORD_TYPE_A = 1, /* IPv4 address */ + OSMO_MDNS_RFC_RECORD_TYPE_TXT = 16, /* Text strings */ + + /* RFC 3596 2.1 */ + OSMO_MDNS_RFC_RECORD_TYPE_AAAA = 28, /* IPv6 address */ + + /* RFC 1035 3.2.3 */ + OSMO_MDNS_RFC_RECORD_TYPE_ALL = 255, /* Request only: ask for all */ +}; + +enum osmo_mdns_rfc_class { + OSMO_MDNS_RFC_CLASS_UNKNOWN = 0, + + /* RFC 1035 3.2.4 */ + OSMO_MDNS_RFC_CLASS_IN = 1, /* Internet and IP networks */ + + /* RFC 1035 3.2.5 */ + OSMO_MDNS_RFC_CLASS_ALL = 255, /* Request only: ask for all */ +}; + +/* RFC 1035 4.1.1 */ +struct osmo_mdns_rfc_header { +#if OSMO_IS_LITTLE_ENDIAN + uint16_t id; + uint8_t rd:1, + tc:1, + aa:1, + opcode:4, + qr:1; /* QR (0: query, 1: response) */ + uint8_t rcode:4, + z:3, + ra:1; + uint16_t qdcount; /* Number of questions */ + uint16_t ancount; /* Number of answers */ + uint16_t nscount; /* Number of authority records */ + uint16_t arcount; /* Number of additional records */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t id; + uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1; + uint8_t ra:1, z:3, rcode:4; + uint16_t qdcount; + uint16_t ancount; + uint16_t nscount; + uint16_t arcount; +#endif +} __attribute__ ((packed)); + +/* RFC 1035 4.1.2 */ +struct osmo_mdns_rfc_question { + char *domain; /* Domain to be encoded as qname (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type qtype; + enum osmo_mdns_rfc_class qclass; +}; + +/* RFC 1035 4.1.3 */ +struct osmo_mdns_rfc_record { + char *domain; /* Domain to be encoded as name (e.g. "gsup.hlr.1234567.imsi") */ + enum osmo_mdns_rfc_record_type type; + enum osmo_mdns_rfc_class class; + uint32_t ttl; + uint16_t rdlength; + uint8_t *rdata; +}; + +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain); +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_len); + +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr); +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr); + +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst); +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len); + +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec); +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len); diff --git a/include/osmocom/mslookup/mdns_sock.h b/include/osmocom/mslookup/mdns_sock.h new file mode 100644 index 0000000..615e971 --- /dev/null +++ b/include/osmocom/mslookup/mdns_sock.h @@ -0,0 +1,33 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once +#include +#include +#include + +struct osmo_mdns_sock { + struct osmo_fd osmo_fd; + struct addrinfo *ai; +}; + +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr); +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg); +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock); diff --git a/include/osmocom/mslookup/mslookup_client_mdns.h b/include/osmocom/mslookup/mslookup_client_mdns.h new file mode 100644 index 0000000..e699107 --- /dev/null +++ b/include/osmocom/mslookup/mslookup_client_mdns.h @@ -0,0 +1,38 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once + +#include + +struct osmo_mslookup_client; +struct osmo_mslookup_client_method; + +/*! MS Lookup mDNS server bind default IP. Taken from the Administratevly Scoped block, particularly the Organizational + * Scoped range, https://tools.ietf.org/html/rfc2365 . */ +#define OSMO_MSLOOKUP_MDNS_IP4 "239.192.23.42" +#define OSMO_MSLOOKUP_MDNS_IP6 "ff08::23:42" // <-- TODO: sane? +#define OSMO_MSLOOKUP_MDNS_PORT 4266 + +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix); + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method); + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method); diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 01be401..07fb6f4 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -10,9 +10,14 @@ lib_LTLIBRARIES = libosmo-mslookup.la libosmo_mslookup_la_SOURCES = \ + mdns.c \ + mdns_msg.c \ + mdns_rfc.c \ + mdns_sock.c \ mslookup.c \ mslookup_client.c \ mslookup_client_fake.c \ + mslookup_client_mdns.c \ $(NULL) libosmo_mslookup_la_LDFLAGS = -version-info $(LIBVERSION) diff --git a/src/mslookup/mdns.c b/src/mslookup/mdns.c new file mode 100644 index 0000000..4742a7c --- /dev/null +++ b/src/mslookup/mdns.c @@ -0,0 +1,425 @@ +/* mslookup specific functions for encoding and decoding mslookup queries/results into mDNS packets, using the high + * level functions from mdns_msg.c and mdns_record.c to build the request/answer messages. */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +static struct msgb *osmo_mdns_msgb_alloc(const char *label) +{ + return msgb_alloc(1024, label); +} + +/*! Combine the mslookup query service, ID and ID type into a domain string. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated buffer with the resulting domain (i.e. "sip.voice.123.msisdn.mdns.osmocom.org") on success, + * NULL on failure. + */ +static char *domain_from_query(void *ctx, const struct osmo_mslookup_query *query, const char *domain_suffix) +{ + const char *id; + + /* Get id from query */ + switch (query->id.type) { + case OSMO_MSLOOKUP_ID_IMSI: + id = query->id.imsi; + break; + case OSMO_MSLOOKUP_ID_MSISDN: + id = query->id.msisdn; + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "can't encode mslookup query id type %i", query->id.type); + return NULL; + } + + return talloc_asprintf(ctx, "%s.%s.%s.%s", query->service, id, osmo_mslookup_id_type_name(query->id.type), + domain_suffix); +} + +/*! Split up query service, ID and ID type from a domain string into a mslookup query. + * \param[in] domain with domain_suffix, e.g. "sip.voice.123.msisdn.mdns.osmocom.org" + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. It is not part of the resulting struct osmo_mslookup_query, so we + * remove it in this function. Example: "mdns.osmocom.org" + */ +int query_from_domain(struct osmo_mslookup_query *query, const char *domain, const char *domain_suffix) +{ + int domain_len = strlen(domain) - strlen(domain_suffix) - 1; + char domain_buf[OSMO_MDNS_RFC_MAX_NAME_LEN]; + + if (domain_len <= 0 || domain_len >= sizeof(domain_buf)) + return -EINVAL; + + if (domain[domain_len] != '.' || strcmp(domain + domain_len + 1, domain_suffix) != 0) + return -EINVAL; + + memcpy(domain_buf, domain, domain_len); + domain_buf[domain_len] = '\0'; + return osmo_mslookup_query_init_from_domain_str(query, domain_buf); +} + +/*! Encode a mslookup query into a mDNS packet. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msgb, or NULL on error. + */ +struct msgb *osmo_mdns_query_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const char *domain_suffix) +{ + struct osmo_mdns_msg_request req = {0}; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + + req.id = packet_id; + req.type = OSMO_MDNS_RFC_RECORD_TYPE_ALL; + req.domain = domain_from_query(ctx, query, domain_suffix); + if (!req.domain) + goto error; + if (osmo_mdns_msg_request_encode(ctx, msg, &req)) + goto error; + talloc_free(req.domain); + return msg; +error: + msgb_free(msg); + talloc_free(req.domain); + return NULL; +} + +/*! Decode a mDNS request packet into a mslookup query. + * \param[out] packet_id the result must be sent with the same packet_id. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns allocated mslookup query on success, NULL on error. + */ +struct osmo_mslookup_query *osmo_mdns_query_decode(void *ctx, const uint8_t *data, size_t data_len, + uint16_t *packet_id, const char *domain_suffix) +{ + struct osmo_mdns_msg_request *req = NULL; + struct osmo_mslookup_query *query = NULL; + + req = osmo_mdns_msg_request_decode(ctx, data, data_len); + if (!req) + return NULL; + + query = talloc_zero(ctx, struct osmo_mslookup_query); + OSMO_ASSERT(query); + if (query_from_domain(query, req->domain, domain_suffix) < 0) + goto error_free; + + *packet_id = req->id; + talloc_free(req); + return query; +error_free: + talloc_free(req); + talloc_free(query); + return NULL; +} + +/*! Parse sockaddr_str from mDNS record, so the mslookup result can be filled with it. + * \param[out] sockaddr_str resulting IPv4 or IPv6 sockaddr_str. + * \param[in] rec single record of the abstracted list of mDNS records + * \returns 0 on success, -EINVAL on error. + */ +static int sockaddr_str_from_mdns_record(struct osmo_sockaddr_str *sockaddr_str, struct osmo_mdns_record *rec) +{ + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (rec->length != 4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of A record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_32(sockaddr_str, *(uint32_t *)rec->data, 0); + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (rec->length != 16) { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected length of AAAA record\n"); + return -EINVAL; + } + osmo_sockaddr_str_from_in6_addr(sockaddr_str, (struct in6_addr*)rec->data, 0); + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + return 0; +} + +/*! Encode a successful mslookup result, along with the original query and packet_id into one mDNS answer packet. + * + * The records in the packet are ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[in] packet_id as received in osmo_mdns_query_decode(). + * \param[in] query the original query, so we can send the domain back in the answer (i.e. "sip.voice.1234.msisdn"). + * \param[in] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns msg on success, NULL on error. + */ +struct msgb *osmo_mdns_result_encode(void *ctx, uint16_t packet_id, const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result, const char *domain_suffix) +{ + struct osmo_mdns_msg_answer ans = {}; + struct osmo_mdns_record *rec_age = NULL; + struct osmo_mdns_record rec_ip_v4 = {0}; + struct osmo_mdns_record rec_ip_v6 = {0}; + struct osmo_mdns_record *rec_ip_v4_port = NULL; + struct osmo_mdns_record *rec_ip_v6_port = NULL; + struct in_addr rec_ip_v4_in; + struct in6_addr rec_ip_v6_in; + struct msgb *msg = osmo_mdns_msgb_alloc(__func__); + char buf[256]; + + ctx = talloc_named(ctx, 0, "osmo_mdns_result_encode"); + + /* Prepare answer (ans) */ + ans.domain = domain_from_query(ctx, query, domain_suffix); + if (!ans.domain) + goto error; + ans.id = packet_id; + INIT_LLIST_HEAD(&ans.records); + + /* Record for age */ + rec_age = osmo_mdns_record_txt_keyval_encode(ctx, "age", "%"PRIu32, result->age); + OSMO_ASSERT(rec_age); + llist_add_tail(&rec_age->list, &ans.records); + + /* Records for IPv4 */ + if (osmo_sockaddr_str_is_set(&result->host_v4)) { + if (osmo_sockaddr_str_to_in_addr(&result->host_v4, &rec_ip_v4_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv4: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v4.type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec_ip_v4.data = (uint8_t *)&rec_ip_v4_in; + rec_ip_v4.length = sizeof(rec_ip_v4_in); + llist_add_tail(&rec_ip_v4.list, &ans.records); + + rec_ip_v4_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v4.port); + OSMO_ASSERT(rec_ip_v4_port); + llist_add_tail(&rec_ip_v4_port->list, &ans.records); + } + + /* Records for IPv6 */ + if (osmo_sockaddr_str_is_set(&result->host_v6)) { + if (osmo_sockaddr_str_to_in6_addr(&result->host_v6, &rec_ip_v6_in) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode ipv6: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + rec_ip_v6.type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec_ip_v6.data = (uint8_t *)&rec_ip_v6_in; + rec_ip_v6.length = sizeof(rec_ip_v6_in); + llist_add_tail(&rec_ip_v6.list, &ans.records); + + rec_ip_v6_port = osmo_mdns_record_txt_keyval_encode(ctx, "port", "%"PRIu16, result->host_v6.port); + OSMO_ASSERT(rec_ip_v6_port); + llist_add_tail(&rec_ip_v6_port->list, &ans.records); + } + + if (osmo_mdns_msg_answer_encode(ctx, msg, &ans)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to encode mDNS answer: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + goto error; + } + talloc_free(ctx); + return msg; +error: + msgb_free(msg); + talloc_free(ctx); + return NULL; +} + +static int decode_uint32_t(const char *str, uint32_t *val) +{ + long long int lld; + char *endptr = NULL; + *val = 0; + errno = 0; + lld = strtoll(str, &endptr, 10); + if (errno || !endptr || *endptr) + return -EINVAL; + if (lld < 0 || lld > UINT32_MAX) + return -EINVAL; + *val = lld; + return 0; +} + +static int decode_port(const char *str, uint16_t *port) +{ + uint32_t val; + if (decode_uint32_t(str, &val)) + return -EINVAL; + if (val > 65535) + return -EINVAL; + *port = val; + return 0; +} + +/*! Read expected mDNS records into mslookup result. + * + * The records in the packet must be ordered as follows: + * 1) "age", ip_v4/v6, "port" (only IPv4 or IPv6 present) or + * 2) "age", ip_v4, "port", ip_v6, "port" (both IPv4 and v6 present). + * "age" and "port" are TXT records, ip_v4 is an A record, ip_v6 is an AAAA record. + * + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] ans abstracted mDNS answer with a list of resource records. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_from_answer(struct osmo_mslookup_result *result, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_record *rec; + char txt_key[64]; + char txt_value[64]; + bool found_age = false; + bool found_ip_v4 = false; + bool found_ip_v6 = false; + struct osmo_sockaddr_str *expect_port_for = NULL; + + *result = (struct osmo_mslookup_result){}; + + result->rc = OSMO_MSLOOKUP_RC_NONE; + + llist_for_each_entry(rec, &ans->records, list) { + switch (rec->type) { + case OSMO_MDNS_RFC_RECORD_TYPE_A: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'A' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v4) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v4 = true; + expect_port_for = &result->host_v4; + if (sockaddr_str_from_mdns_record(expect_port_for, rec)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'A' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_AAAA: + if (expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'AAAA' record found, but still expecting a 'port' value first\n"); + return -EINVAL; + } + if (found_ip_v6) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record found twice in mDNS answer\n"); + return -EINVAL; + } + found_ip_v6 = true; + expect_port_for = &result->host_v6; + if (sockaddr_str_from_mdns_record(expect_port_for, rec) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "'AAAA' record with invalid address data\n"); + return -EINVAL; + } + break; + case OSMO_MDNS_RFC_RECORD_TYPE_TXT: + if (osmo_mdns_record_txt_keyval_decode(rec, txt_key, sizeof(txt_key), + txt_value, sizeof(txt_value)) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to decode txt record\n"); + return -EINVAL; + } + if (strcmp(txt_key, "age") == 0) { + if (found_age) { + LOGP(DMSLOOKUP, LOGL_ERROR, "duplicate 'TXT' record for 'age'\n"); + return -EINVAL; + } + found_age = true; + if (decode_uint32_t(txt_value, &result->age)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'age' value ('age=%s')\n", txt_value); + return -EINVAL; + } + } else if (strcmp(txt_key, "port") == 0) { + if (!expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record for 'port' without previous 'A' or 'AAAA' record\n"); + return -EINVAL; + } + if (decode_port(txt_value, &expect_port_for->port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, + "'TXT' record: invalid 'port' value ('port=%s')\n", txt_value); + return -EINVAL; + } + expect_port_for = NULL; + } else { + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected key '%s' in TXT record\n", txt_key); + return -EINVAL; + } + break; + default: + LOGP(DMSLOOKUP, LOGL_ERROR, "unexpected record type\n"); + return -EINVAL; + } + } + + /* Check if everything was found */ + if (!found_age || !(found_ip_v4 || found_ip_v6) || expect_port_for) { + LOGP(DMSLOOKUP, LOGL_ERROR, "missing resource records in mDNS answer\n"); + return -EINVAL; + } + + result->rc = OSMO_MSLOOKUP_RC_RESULT; + return 0; +} + +/*! Decode a mDNS answer packet into a mslookup result, query and packet_id. + * \param[out] packet_id same ID as sent in the request packet. + * \param[out] query the original query (service, ID, ID type). + * \param[out] result holds the age, IPs and ports of the queried service. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_result_decode(void *ctx, const uint8_t *data, size_t data_len, uint16_t *packet_id, + struct osmo_mslookup_query *query, struct osmo_mslookup_result *result, + const char *domain_suffix) +{ + int rc = -EINVAL; + struct osmo_mdns_msg_answer *ans; + ans = osmo_mdns_msg_answer_decode(ctx, data, data_len); + if (!ans) + goto exit_free; + + if (query_from_domain(query, ans->domain, domain_suffix) < 0) + goto exit_free; + + if (osmo_mdns_result_from_answer(result, ans) < 0) + goto exit_free; + + *packet_id = ans->id; + rc = 0; + +exit_free: + talloc_free(ans); + return rc; +} diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c new file mode 100644 index 0000000..da65fef --- /dev/null +++ b/src/mslookup/mdns_msg.c @@ -0,0 +1,261 @@ +/* High level mDNS encoding and decoding functions for whole messages: + * Request message (header, question) + * Answer message (header, resource record 1, ... resource record N)*/ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include + +/*! Encode request message into one mDNS packet, consisting of the header section and one question section. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_request_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_request *req) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_rfc_question qst = {0}; + + hdr.id = req->id; + hdr.qdcount = 1; + osmo_mdns_rfc_header_encode(msg, &hdr); + + qst.domain = req->domain; + qst.qtype = req->type; + qst.qclass = OSMO_MDNS_RFC_CLASS_IN; + if (osmo_mdns_rfc_question_encode(ctx, msg, &qst) != 0) + return -EINVAL; + + return 0; +} + +/*! Decode request message from a mDNS packet, consisting of the header section and one question section. + * \returns allocated request message on success, NULL on error. + */ +struct osmo_mdns_msg_request *osmo_mdns_msg_request_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {0}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_rfc_question* qst = NULL; + struct osmo_mdns_msg_request *ret = NULL; + + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 0) + return NULL; + + qst = osmo_mdns_rfc_question_decode(ctx, data + hdr_len, data_len - hdr_len); + if (!qst) + return NULL; + + ret = talloc_zero(ctx, struct osmo_mdns_msg_request); + ret->id = hdr.id; + ret->domain = talloc_strdup(ret, qst->domain); + ret->type = qst->qtype; + + talloc_free(qst); + return ret; +} + +/*! Initialize the linked list for resource records in a answer message. */ +void osmo_mdns_msg_answer_init(struct osmo_mdns_msg_answer *ans) +{ + *ans = (struct osmo_mdns_msg_answer){}; + INIT_LLIST_HEAD(&ans->records); +} + +/*! Encode answer message into one mDNS packet, consisting of the header section and N resource records. + * + * To keep things simple, this sends the domain with each resource record. Other DNS implementations make use of + * "message compression", which would send a question section with the domain before the resource records, and then + * point inside each resource record with an offset back to the domain in the question section (RFC 1035 4.1.4). + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_msg_answer_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_msg_answer *ans) +{ + struct osmo_mdns_rfc_header hdr = {0}; + struct osmo_mdns_record *ans_record; + + hdr.id = ans->id; + hdr.qr = 1; + hdr.ancount = llist_count(&ans->records); + osmo_mdns_rfc_header_encode(msg, &hdr); + + llist_for_each_entry(ans_record, &ans->records, list) { + struct osmo_mdns_rfc_record rec = {0}; + + rec.domain = ans->domain; + rec.type = ans_record->type; + rec.class = OSMO_MDNS_RFC_CLASS_IN; + rec.ttl = 0; + rec.rdlength = ans_record->length; + rec.rdata = ans_record->data; + + if (osmo_mdns_rfc_record_encode(ctx, msg, &rec) != 0) + return -EINVAL; + } + + return 0; +} + +/*! Decode answer message from a mDNS packet. + * + * Answer messages must consist of one header and one or more resource records. An additional question section or + * message compression (RFC 1035 4.1.4) are not supported. +* \returns allocated answer message on success, NULL on error. + */ +struct osmo_mdns_msg_answer *osmo_mdns_msg_answer_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_header hdr = {}; + size_t hdr_len = sizeof(struct osmo_mdns_rfc_header); + struct osmo_mdns_msg_answer *ret = talloc_zero(ctx, struct osmo_mdns_msg_answer); + + /* Parse header section */ + if (data_len < hdr_len || osmo_mdns_rfc_header_decode(data, hdr_len, &hdr) != 0 || hdr.qr != 1) + goto error; + ret->id = hdr.id; + data_len -= hdr_len; + data += hdr_len; + + /* Parse resource records */ + INIT_LLIST_HEAD(&ret->records); + while (data_len) { + size_t record_len; + struct osmo_mdns_rfc_record *rec; + struct osmo_mdns_record* ret_record; + + rec = osmo_mdns_rfc_record_decode(ret, data, data_len, &record_len); + if (!rec) + goto error; + + /* Copy domain to ret */ + if (ret->domain) { + if (strcmp(ret->domain, rec->domain) != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "domain mismatch in resource records ('%s' vs '%s')\n", + ret->domain, rec->domain); + goto error; + } + } + else + ret->domain = talloc_strdup(ret, rec->domain); + + /* Add simplified record to ret */ + ret_record = talloc_zero(ret, struct osmo_mdns_record); + ret_record->type = rec->type; + ret_record->length = rec->rdlength; + ret_record->data = talloc_memdup(ret_record, rec->rdata, rec->rdlength); + llist_add_tail(&ret_record->list, &ret->records); + + data += record_len; + data_len -= record_len; + talloc_free(rec); + } + + /* Verify record count */ + if (llist_count(&ret->records) != hdr.ancount) { + LOGP(DMSLOOKUP, LOGL_ERROR, "amount of parsed records (%i) doesn't match count in header (%i)\n", + llist_count(&ret->records), hdr.ancount); + goto error; + } + + return ret; +error: + talloc_free(ret); + return NULL; +} + +/*! Get a TXT resource record, which stores a key=value string. + * \returns allocated resource record on success, NULL on error. + */ +static struct osmo_mdns_record *_osmo_mdns_record_txt_encode(void *ctx, const char *key, const char *value) +{ + struct osmo_mdns_record *ret = talloc_zero(ctx, struct osmo_mdns_record); + size_t len = strlen(key) + 1 + strlen(value); + + if (len > OSMO_MDNS_RFC_MAX_CHARACTER_STRING_LEN - 1) + return NULL; + + /* redundant len is required, see RFC 1035 3.3.14 and 3.3. */ + ret->data = (uint8_t *)talloc_asprintf(ctx, "%c%s=%s", (char)len, key, value); + if (!ret->data) + return NULL; + ret->type = OSMO_MDNS_RFC_RECORD_TYPE_TXT; + ret->length = len + 1; + return ret; +} + +/*! Get a TXT resource record, which stores a key=value string, but build value from a format string. + * \returns allocated resource record on success, NULL on error. + */ +struct osmo_mdns_record *osmo_mdns_record_txt_keyval_encode(void *ctx, const char *key, const char *value_fmt, ...) +{ + va_list ap; + char *value = NULL; + struct osmo_mdns_record *r; + + if (!value_fmt) + return _osmo_mdns_record_txt_encode(ctx, key, ""); + + va_start(ap, value_fmt); + value = talloc_vasprintf(ctx, value_fmt, ap); + if (!value) + return NULL; + va_end(ap); + r = _osmo_mdns_record_txt_encode(ctx, key, value); + talloc_free(value); + return r; +} + +/*! Decode a TXT resource record, which stores a key=value string. + * \returns 0 on success, -EINVAL on error. + */ +int osmo_mdns_record_txt_keyval_decode(const struct osmo_mdns_record *rec, + char *key_buf, size_t key_size, char *value_buf, size_t value_size) +{ + const char *key_value; + const char *key_value_end; + const char *sep; + const char *value; + + if (rec->type != OSMO_MDNS_RFC_RECORD_TYPE_TXT) + return -EINVAL; + + key_value = (const char *)rec->data; + key_value_end = key_value + rec->length; + + /* Verify and then skip the redundant string length byte */ + if (*key_value != rec->length - 1) + return -EINVAL; + key_value++; + + if (key_value >= key_value_end) + return -EINVAL; + + /* Find equals sign */ + sep = osmo_strnchr(key_value, key_value_end - key_value, '='); + if (!sep) + return -EINVAL; + + /* Parse key */ + osmo_print_n(key_buf, key_size, key_value, sep - key_value); + + /* Parse value */ + value = sep + 1; + osmo_print_n(value_buf, value_size, value, key_value_end - value); + return 0; +} diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c new file mode 100644 index 0000000..e1fc184 --- /dev/null +++ b/src/mslookup/mdns_rfc.c @@ -0,0 +1,265 @@ +/* Low level mDNS encoding and decoding functions of the qname IE, header/question sections and resource records, + * as described in these RFCs: + * - RFC 1035 (Domain names - implementation and specification) + * - RFC 3596 (DNS Extensions to Support IP Version 6) */ + +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include + +/* + * Encode/decode IEs + */ + +/*! Encode a domain string as qname (RFC 1035 4.1.2). + * \param[in] domain multiple labels separated by dots, e.g. "sip.voice.1234.msisdn". + * \returns allocated buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...), NULL on error. + */ +char *osmo_mdns_rfc_qname_encode(void *ctx, const char *domain) +{ + char *domain_dup; + char *domain_iter; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 2] = ""; /* len(qname) is len(domain) +1 */ + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + char *label; + + if (strlen(domain) > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + domain_iter = domain_dup = talloc_strdup(ctx, domain); + while ((label = strsep(&domain_iter, "."))) { + size_t len = strlen(label); + + /* Empty domain, dot at start, two dots in a row, or ending with a dot */ + if (!len) + goto error; + + OSMO_STRBUF_PRINTF(sb, "%c%s", (char)len, label); + } + + talloc_free(domain_dup); + return talloc_strdup(ctx, buf); + +error: + talloc_free(domain_dup); + return NULL; +} + +/*! Decode a domain string from a qname (RFC 1035 4.1.2). + * \param[in] qname buffer with length-value pairs for each label (e.g. 0x03 "sip" 0x05 "voice" ...) + * \param[in] qname_max_len amount of bytes that can be read at most from the memory location that qname points to. + * \returns allocated buffer with domain string, multiple labels separated by dots (e.g. "sip.voice.1234.msisdn"), + * NULL on error. + */ +char *osmo_mdns_rfc_qname_decode(void *ctx, const char *qname, size_t qname_max_len) +{ + const char *next_label, *qname_end = qname + qname_max_len; + char buf[OSMO_MDNS_RFC_MAX_NAME_LEN + 1]; + int i = 0; + + if (qname_max_len < 1) + return NULL; + + while (*qname) { + size_t len = *qname; + next_label = qname + len + 1; + + if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) + return NULL; + + if (i) { + /* Two dots in a row is not allowed */ + if (buf[i - 1] == '.') + return NULL; + + buf[i] = '.'; + i++; + } + + memcpy(buf + i, qname + 1, len); + i += len; + qname = next_label; + } + buf[i] = '\0'; + + return talloc_strdup(ctx, buf); +} + +/* + * Encode/decode message sections + */ + +/*! Encode header section (RFC 1035 4.1.1). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +void osmo_mdns_rfc_header_encode(struct msgb *msg, const struct osmo_mdns_rfc_header *hdr) +{ + struct osmo_mdns_rfc_header *buf = (struct osmo_mdns_rfc_header *) msgb_put(msg, sizeof(*hdr)); + memcpy(buf, hdr, sizeof(*hdr)); + + osmo_store16be(buf->id, &buf->id); + osmo_store16be(buf->qdcount, &buf->qdcount); + osmo_store16be(buf->ancount, &buf->ancount); + osmo_store16be(buf->nscount, &buf->nscount); + osmo_store16be(buf->arcount, &buf->arcount); +} + +/*! Decode header section (RFC 1035 4.1.1). */ +int osmo_mdns_rfc_header_decode(const uint8_t *data, size_t data_len, struct osmo_mdns_rfc_header *hdr) +{ + if (data_len != sizeof(*hdr)) + return -EINVAL; + + memcpy(hdr, data, data_len); + + hdr->id = osmo_load16be(&hdr->id); + hdr->qdcount = osmo_load16be(&hdr->qdcount); + hdr->ancount = osmo_load16be(&hdr->ancount); + hdr->nscount = osmo_load16be(&hdr->nscount); + hdr->arcount = osmo_load16be(&hdr->arcount); + + return 0; +} + +/*! Encode question section (RFC 1035 4.1.2). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_question_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_question *qst) +{ + char *qname; + size_t qname_len; + uint8_t *qname_buf; + + /* qname */ + qname = osmo_mdns_rfc_qname_encode(ctx, qst->domain); + if (!qname) + return -EINVAL; + qname_len = strlen(qname) + 1; + qname_buf = msgb_put(msg, qname_len); + memcpy(qname_buf, qname, qname_len); + talloc_free(qname); + + /* qtype and qclass */ + msgb_put_u16(msg, qst->qtype); + msgb_put_u16(msg, qst->qclass); + + return 0; +} + +/*! Decode question section (RFC 1035 4.1.2). */ +struct osmo_mdns_rfc_question *osmo_mdns_rfc_question_decode(void *ctx, const uint8_t *data, size_t data_len) +{ + struct osmo_mdns_rfc_question *ret; + size_t qname_len = data_len - 4; + + if (data_len < 6) + return NULL; + + /* qname */ + ret = talloc_zero(ctx, struct osmo_mdns_rfc_question); + if (!ret) + return NULL; + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, qname_len); + if (!ret->domain) { + talloc_free(ret); + return NULL; + } + + /* qtype and qclass */ + ret->qtype = osmo_load16be(data + qname_len); + ret->qclass = osmo_load16be(data + qname_len + 2); + + return ret; +} + +/* + * Encode/decode resource records + */ + +/*! Encode one resource record (RFC 1035 4.1.3). + * \param[in] msgb mesage buffer to which the encoded data will be appended. + */ +int osmo_mdns_rfc_record_encode(void *ctx, struct msgb *msg, const struct osmo_mdns_rfc_record *rec) +{ + char *name; + size_t name_len; + uint8_t *buf; + + /* name */ + name = osmo_mdns_rfc_qname_encode(ctx, rec->domain); + if (!name) + return -EINVAL; + name_len = strlen(name) + 1; + buf = msgb_put(msg, name_len); + memcpy(buf, name, name_len); + talloc_free(name); + + /* type, class, ttl, rdlength */ + msgb_put_u16(msg, rec->type); + msgb_put_u16(msg, rec->class); + msgb_put_u32(msg, rec->ttl); + msgb_put_u16(msg, rec->rdlength); + + /* rdata */ + buf = msgb_put(msg, rec->rdlength); + memcpy(buf, rec->rdata, rec->rdlength); + return 0; +} + +/*! Decode one resource record (RFC 1035 4.1.3). */ +struct osmo_mdns_rfc_record *osmo_mdns_rfc_record_decode(void *ctx, const uint8_t *data, size_t data_len, + size_t *record_len) +{ + struct osmo_mdns_rfc_record *ret = talloc_zero(ctx, struct osmo_mdns_rfc_record); + size_t name_len; + + /* name */ + ret->domain = osmo_mdns_rfc_qname_decode(ret, (const char *)data, data_len - 10); + if (!ret->domain) + goto error; + name_len = strlen(ret->domain) + 2; + if (name_len + 10 > data_len) + goto error; + + /* type, class, ttl, rdlength */ + ret->type = osmo_load16be(data + name_len); + ret->class = osmo_load16be(data + name_len + 2); + ret->ttl = osmo_load32be(data + name_len + 4); + ret->rdlength = osmo_load16be(data + name_len + 8); + if (name_len + 10 + ret->rdlength > data_len) + goto error; + + /* rdata */ + ret->rdata = talloc_memdup(ret, data + name_len + 10, ret->rdlength); + if (!ret->rdata) + return NULL; + + *record_len = name_len + 10 + ret->rdlength; + return ret; +error: + talloc_free(ret); + return NULL; +} + diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c new file mode 100644 index 0000000..5291660 --- /dev/null +++ b/src/mslookup/mdns_sock.c @@ -0,0 +1,144 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*! Open socket to send and receive multicast data. + * + * The socket is opened with SO_REUSEADDR, so we can bind to the same IP and port multiple times. This socket receives + * everything sent to that multicast IP/port, including its own data data sent from osmo_mdns_sock_send(). So whenever + * sending something, the receive callback will be called with the same data and should discard it. + * + * \param[in] ip multicast IPv4 or IPv6 address. + * \param[in] port port number. + * \param[in] cb callback for incoming data that will be passed to osmo_fd_setup (should read from osmo_fd->fd). + * \param[in] data userdata passed to osmo_fd (available in cb as osmo_fd->data). + * \param[in] priv_nr additional userdata integer passed to osmo_fd (available in cb as osmo_fd->priv_nr). + * \returns allocated osmo_mdns_sock, NULL on error. + */ +struct osmo_mdns_sock *osmo_mdns_sock_init(void *ctx, const char *ip, unsigned int port, + int (*cb)(struct osmo_fd *fd, unsigned int what), + void *data, unsigned int priv_nr) +{ + struct osmo_mdns_sock *ret; + int sock, rc; + struct addrinfo hints = {0}; + struct ip_mreq multicast_req = {0}; + in_addr_t iface = INADDR_ANY; + char portbuf[10]; + int y = 1; + + snprintf(portbuf, sizeof(portbuf) -1, "%u", port); + ret = talloc_zero(ctx, struct osmo_mdns_sock); + OSMO_ASSERT(ret); + + /* Fill addrinfo */ + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); + rc = getaddrinfo(ip, portbuf, &hints, &ret->ai); + if (rc != 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: getaddrinfo: %s\n", gai_strerror(rc)); + ret->ai = NULL; + goto error; + } + + /* Open socket */ + sock = socket(ret->ai->ai_family, ret->ai->ai_socktype, 0); + if (sock == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: socket: %s\n", strerror(errno)); + goto error; + } + + /* Set multicast options */ + rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, + sizeof(multicast_req.imr_multiaddr)); + multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); + rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by + * just using a different socket for server and client code) and in the mslookup_client_mdns_test. Also for + * osmo-mslookup-client if it is running multiple times in parallel (i.e. two incoming calls almost at the same + * time need to be resolved with the simple dialplan example that just starts new processes). */ + rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); + goto error; + } + + /* Bind and register osmo_fd callback */ + rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); + if (rc == -1) { + LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); + goto error; + } + osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); + if (osmo_fd_register(&ret->osmo_fd) != 0) + goto error; + + return ret; +error: + if (ret->ai) + freeaddrinfo(ret->ai); + talloc_free(ret); + return NULL; +} + +/*! Send msgb over mdns_sock and consume msgb. + * \returns 0 on success, -1 on error. + */ +int osmo_mdns_sock_send(const struct osmo_mdns_sock *mdns_sock, struct msgb *msg) +{ + size_t len = msgb_length(msg); + int rc = sendto(mdns_sock->osmo_fd.fd, msgb_data(msg), len, 0, mdns_sock->ai->ai_addr, + mdns_sock->ai->ai_addrlen); + msgb_free(msg); + return (rc == len) ? 0 : -1; +} + +/*! Tear down osmo_mdns_sock. */ +void osmo_mdns_sock_cleanup(struct osmo_mdns_sock *mdns_sock) +{ + osmo_fd_close(&mdns_sock->osmo_fd); + freeaddrinfo(mdns_sock->ai); + talloc_free(mdns_sock); +} diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c new file mode 100644 index 0000000..7ba3502 --- /dev/null +++ b/src/mslookup/mslookup_client_mdns.c @@ -0,0 +1,235 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct osmo_mdns_method_state { + /* Parameters passed by _add_method_dns() */ + struct osmo_sockaddr_str bind_addr; + const char *domain_suffix; + + struct osmo_mdns_sock *mc; + + struct osmo_mslookup_client *client; + struct llist_head requests; + uint16_t next_packet_id; +}; + +struct osmo_mdns_method_request { + struct llist_head entry; + uint32_t request_handle; + struct osmo_mslookup_query query; + uint16_t packet_id; +}; + +static int request_handle_by_query(uint32_t *request_handle, struct osmo_mdns_method_state *state, + struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mdns_method_request *request; + + llist_for_each_entry(request, &state->requests, entry) { + if (strcmp(request->query.service, query->service) != 0) + continue; + if (osmo_mslookup_id_cmp(&request->query.id, &query->id) != 0) + continue; + + /* Match! */ + *request_handle = request->request_handle; + return 0; + } + return -1; +} + +static int mdns_method_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + struct osmo_mdns_method_state *state = osmo_fd->data; + struct osmo_mslookup_result result; + struct osmo_mslookup_query query; + uint16_t packet_id; + int n; + uint8_t buffer[1024]; + uint32_t request_handle = 0; + void *ctx = state; + + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + if (n < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "failed to read from socket\n"); + return n; + } + + if (osmo_mdns_result_decode(ctx, buffer, n, &packet_id, &query, &result, state->domain_suffix) < 0) + return -EINVAL; + + if (request_handle_by_query(&request_handle, state, &query, packet_id) != 0) + return -EINVAL; + + osmo_mslookup_client_rx_result(state->client, request_handle, &result); + return n; +} + +static void mdns_method_request(struct osmo_mslookup_client_method *method, const struct osmo_mslookup_query *query, + uint32_t request_handle) +{ + char buf[256]; + struct osmo_mdns_method_state *state = method->priv; + struct msgb *msg; + struct osmo_mdns_method_request *r = talloc_zero(method->client, struct osmo_mdns_method_request); + + *r = (struct osmo_mdns_method_request){ + .request_handle = request_handle, + .query = *query, + .packet_id = state->next_packet_id, + }; + llist_add(&r->entry, &state->requests); + state->next_packet_id++; + + msg = osmo_mdns_query_encode(method->client, r->packet_id, query, state->domain_suffix); + if (!msg) { + LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", + osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + } + + /* Send over the wire */ + LOGP(DMSLOOKUP, LOGL_DEBUG, "sending mDNS query: %s.%s\n", query->service, + osmo_mslookup_id_name_b(buf, sizeof(buf), &query->id)); + if (osmo_mdns_sock_send(state->mc, msg) == -1) + LOGP(DMSLOOKUP, LOGL_ERROR, "sending mDNS query failed\n"); +} + +static void mdns_method_request_cleanup(struct osmo_mslookup_client_method *method, uint32_t request_handle) +{ + struct osmo_mdns_method_state *state = method->priv; + + /* Tear down any state associated with this handle. */ + struct osmo_mdns_method_request *r; + llist_for_each_entry(r, &state->requests, entry) { + if (r->request_handle != request_handle) + continue; + llist_del(&r->entry); + talloc_free(r); + return; + } +} + +static void mdns_method_destruct(struct osmo_mslookup_client_method *method) +{ + struct osmo_mdns_method_state *state = method->priv; + struct osmo_mdns_method_request *e, *n; + if (!state) + return; + + /* Drop all DNS lookup request state. Triggering a timeout event and cleanup for mslookup client users will + * happen in the mslookup_client.c, we will simply stop responding from this lookup method. */ + llist_for_each_entry_safe(e, n, &state->requests, entry) { + llist_del(&e->entry); + } + + osmo_mdns_sock_cleanup(state->mc); +} + +/*! Initialize the mDNS lookup method. + * \param[in] client the client to attach the method to. + * \param[in] ip IPv4 or IPv6 address string. + * \param[in] port The port to bind to. + * \param[in] initial_packet_id Used in the first mslookup query, then increased by one in each following query. All + * servers answer to each query with the same packet ID. Set to -1 to use a random + * initial ID (recommended unless you need deterministic output). This ID is for visually + * distinguishing the packets in packet sniffers, the mslookup client uses not just the + * ID, but all query parameters (service type, ID, ID type), to determine if a reply is + * relevant. + * \param[in] domain_suffix is appended to each domain in the queries to avoid colliding with the top-level domains + * administrated by IANA. Example: "mdns.osmocom.org" */ +struct osmo_mslookup_client_method *osmo_mslookup_client_add_mdns(struct osmo_mslookup_client *client, const char *ip, + uint16_t port, int initial_packet_id, + const char *domain_suffix) +{ + struct osmo_mdns_method_state *state; + struct osmo_mslookup_client_method *m; + + m = talloc_zero(client, struct osmo_mslookup_client_method); + OSMO_ASSERT(m); + + state = talloc_zero(m, struct osmo_mdns_method_state); + OSMO_ASSERT(state); + INIT_LLIST_HEAD(&state->requests); + if (osmo_sockaddr_str_from_str(&state->bind_addr, ip, port)) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: invalid address/port: %s %u\n", + ip, port); + goto error_cleanup; + } + + if (initial_packet_id == -1) { + if (osmo_get_rand_id((uint8_t *)&state->next_packet_id, 2) < 0) { + LOGP(DMSLOOKUP, LOGL_ERROR, "mslookup mDNS: failed to generate random initial packet ID\n"); + goto error_cleanup; + } + } else + state->next_packet_id = initial_packet_id; + + state->client = client; + state->domain_suffix = domain_suffix; + + state->mc = osmo_mdns_sock_init(state, ip, port, mdns_method_recv, state, 0); + if (!state->mc) + goto error_cleanup; + + *m = (struct osmo_mslookup_client_method){ + .name = "mDNS", + .priv = state, + .request = mdns_method_request, + .request_cleanup = mdns_method_request_cleanup, + .destruct = mdns_method_destruct, + }; + + osmo_mslookup_client_method_add(client, m); + return m; + +error_cleanup: + talloc_free(m); + return NULL; +} + +const struct osmo_sockaddr_str *osmo_mslookup_client_method_mdns_get_bind_addr(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return &state->bind_addr; +} + +const char *osmo_mslookup_client_method_mdns_get_domain_suffix(struct osmo_mslookup_client_method *dns_method) +{ + struct osmo_mdns_method_state *state; + if (!dns_method || !dns_method->priv) + return NULL; + state = dns_method->priv; + return state->domain_suffix; +} diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index 71602a3..ebf2add 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -16,11 +16,15 @@ $(NULL) EXTRA_DIST = \ + mdns_test.err \ + mslookup_client_mdns_test.err \ mslookup_client_test.err \ mslookup_test.err \ $(NULL) check_PROGRAMS = \ + mdns_test \ + mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -41,6 +45,22 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +mdns_test_SOURCES = \ + mdns_test.c \ + $(NULL) +mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c new file mode 100644 index 0000000..8a60e85 --- /dev/null +++ b/tests/mslookup/mdns_test.c @@ -0,0 +1,602 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct qname_enc_dec_test { + const char *domain; + const char *qname; + size_t qname_max_len; /* default: strlen(qname) + 1 */ +}; + +static const struct qname_enc_dec_test qname_enc_dec_test_data[] = { + { + /* OK: typical mslookup domain */ + .domain = "hlr.1234567.imsi", + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: double dot */ + .domain = "hlr..imsi", + .qname = NULL, + }, + { + /* Wrong format: double dot */ + .domain = "hlr", + .qname = "\x03hlr\0\x03imsi", + }, + { + /* Wrong format: dot at end */ + .domain = "hlr.", + .qname = NULL, + }, + { + /* Wrong format: dot at start */ + .domain = ".hlr", + .qname = NULL, + }, + { + /* Wrong format: empty */ + .domain = "", + .qname = NULL, + }, + { + /* OK: maximum length */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345" + , + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\x05" "12345" + }, + { + /* Error: too long domain */ + .domain = + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "123456789." "123456789." "123456789." "123456789." "123456789." + "12345toolong" + , + .qname = NULL, + }, + { + /* Error: too long qname */ + .domain = NULL, + .qname = + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + "\t123456789\t123456789\t123456789\t123456789\t123456789" + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x05" "imsi", + }, + { + /* Error: wrong token length in qname */ + .domain = NULL, + .qname = "\x02" "hlr" "\x07" "1234567" "\x04" "imsi", + }, + { + /* Wrong format: token length at end of qname */ + .domain = NULL, + .qname = "\x03hlr\x03", + }, + { + /* Error: overflow in label length */ + .domain = NULL, + .qname = "\x03" "hlr" "\x07" "1234567" "\x04" "imsi", + .qname_max_len = 17, + }, +}; + +void test_enc_dec_rfc_qname(void *ctx) +{ + char quote_buf[300]; + int i; + + fprintf(stderr, "-- %s --\n", __func__); + + for (i = 0; i < ARRAY_SIZE(qname_enc_dec_test_data); i++) { + const struct qname_enc_dec_test *t = &qname_enc_dec_test_data[i]; + char *res; + + if (t->domain) { + fprintf(stderr, "domain: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + res = osmo_mdns_rfc_qname_encode(ctx, t->domain); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->qname == res || (t->qname && res && strcmp(t->qname, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + + if (t->qname) { + size_t qname_max_len = t->qname_max_len; + if (qname_max_len) + fprintf(stderr, "qname_max_len: %lu\n", qname_max_len); + else + qname_max_len = strlen(t->qname) + 1; + + fprintf(stderr, "qname: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->qname, -1)); + fprintf(stderr, "exp: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), t->domain, -1)); + res = osmo_mdns_rfc_qname_decode(ctx, t->qname, qname_max_len); + fprintf(stderr, "res: %s\n", osmo_quote_str_buf2(quote_buf, sizeof(quote_buf), res, -1)); + if (t->domain == res || (t->domain && res && strcmp(t->domain, res) == 0)) + fprintf(stderr, "=> OK\n"); + else + fprintf(stderr, "=> ERROR\n"); + if (res) + talloc_free(res); + fprintf(stderr, "\n"); + } + } +} + +#define PRINT_HDR(hdr, name) \ + fprintf(stderr, "header %s:\n" \ + ".id = %i\n" \ + ".qr = %i\n" \ + ".opcode = %x\n" \ + ".aa = %i\n" \ + ".tc = %i\n" \ + ".rd = %i\n" \ + ".ra = %i\n" \ + ".z = %x\n" \ + ".rcode = %x\n" \ + ".qdcount = %u\n" \ + ".ancount = %u\n" \ + ".nscount = %u\n" \ + ".arcount = %u\n", \ + name, hdr.id, hdr.qr, hdr.opcode, hdr.aa, hdr.tc, hdr.rd, hdr.ra, hdr.z, hdr.rcode, hdr.qdcount, \ + hdr.ancount, hdr.nscount, hdr.arcount) + +static const struct osmo_mdns_rfc_header header_enc_dec_test_data[] = { + { + /* Typical use case for mslookup */ + .id = 1337, + .qdcount = 1, + }, + { + /* Fill out everything */ + .id = 42, + .qr = 1, + .opcode = 0x02, + .aa = 1, + .tc = 1, + .rd = 1, + .ra = 1, + .z = 0x02, + .rcode = 0x03, + .qdcount = 1234, + .ancount = 1111, + .nscount = 2222, + .arcount = 3333, + }, +}; + +void test_enc_dec_rfc_header() +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(header_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_header in = header_enc_dec_test_data[i]; + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_HDR(in, "in"); + osmo_mdns_rfc_header_encode(msg, &in); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), msgb_length(msg), &out) == 0); + PRINT_HDR(out, "out"); + + fprintf(stderr, "in (hexdump): %s\n", osmo_hexdump((unsigned char *)&in, sizeof(in))); + fprintf(stderr, "out (hexdump): %s\n", osmo_hexdump((unsigned char *)&out, sizeof(out))); + assert(memcmp(&in, &out, sizeof(in)) == 0); + + fprintf(stderr, "=> OK\n\n"); + msgb_free(msg); + } +} + +void test_enc_dec_rfc_header_einval() +{ + struct osmo_mdns_rfc_header out = {0}; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + fprintf(stderr, "-- %s --\n", __func__); + + assert(osmo_mdns_rfc_header_decode(msgb_data(msg), 11, &out) == -EINVAL); + fprintf(stderr, "=> OK\n\n"); + + msgb_free(msg); +} + +#define PRINT_QST(qst, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".qtype = %i\n" \ + ".qclass = %i\n", \ + name, (qst)->domain, (qst)->qtype, (qst)->qclass) + +static const struct osmo_mdns_rfc_question question_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_ALL, + .qclass = OSMO_MDNS_RFC_CLASS_IN, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_A, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, + { + .domain = "hlr.1234567.imsi", + .qtype = OSMO_MDNS_RFC_RECORD_TYPE_AAAA, + .qclass = OSMO_MDNS_RFC_CLASS_ALL, + }, +}; + +void test_enc_dec_rfc_question(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i< ARRAY_SIZE(question_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_question in = question_enc_dec_test_data[i]; + struct osmo_mdns_rfc_question *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + + PRINT_QST(&in, "in"); + assert(osmo_mdns_rfc_question_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_question_decode(ctx, msgb_data(msg), msgb_length(msg)); + assert(out); + PRINT_QST(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.qtype != out->qtype) + fprintf(stderr, "=> ERROR: qtype does not match\n"); + else if (in.qclass != out->qclass) + fprintf(stderr, "=> ERROR: qclass does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +void test_enc_dec_rfc_question_null(void *ctx) +{ + uint8_t data[5] = {0}; + + fprintf(stderr, "-- %s --\n", __func__); + assert(osmo_mdns_rfc_question_decode(ctx, data, sizeof(data)) == NULL); + fprintf(stderr, "=> OK\n\n"); +} + +#define PRINT_REC(rec, name) \ + fprintf(stderr, "question %s:\n" \ + ".domain = %s\n" \ + ".type = %i\n" \ + ".class = %i\n" \ + ".ttl = %i\n" \ + ".rdlength = %i\n" \ + ".rdata = %s\n", \ + name, (rec)->domain, (rec)->type, (rec)->class, (rec)->ttl, (rec)->rdlength, \ + osmo_quote_str((char *)(rec)->rdata, (rec)->rdlength)) + +static const struct osmo_mdns_rfc_record record_enc_dec_test_data[] = { + { + .domain = "hlr.1234567.imsi", + .type = OSMO_MDNS_RFC_RECORD_TYPE_A, + .class = OSMO_MDNS_RFC_CLASS_IN, + .ttl = 1234, + .rdlength = 9, + .rdata = (uint8_t *)"10.42.2.1", + }, +}; + +void test_enc_dec_rfc_record(void *ctx) +{ + int i; + + fprintf(stderr, "-- %s --\n", __func__); + for (i=0; i< ARRAY_SIZE(record_enc_dec_test_data); i++) { + const struct osmo_mdns_rfc_record in = record_enc_dec_test_data[i]; + struct osmo_mdns_rfc_record *out; + struct msgb *msg = msgb_alloc(4096, "dns_test"); + size_t record_len; + + PRINT_REC(&in, "in"); + assert(osmo_mdns_rfc_record_encode(ctx, msg, &in) == 0); + fprintf(stderr, "encoded: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + out = osmo_mdns_rfc_record_decode(ctx, msgb_data(msg), msgb_length(msg), &record_len); + fprintf(stderr, "record_len: %lu\n", record_len); + assert(out); + PRINT_REC(out, "out"); + + if (strcmp(in.domain, out->domain) != 0) + fprintf(stderr, "=> ERROR: domain does not match\n"); + else if (in.type != out->type) + fprintf(stderr, "=> ERROR: type does not match\n"); + else if (in.class != out->class) + fprintf(stderr, "=> ERROR: class does not match\n"); + else if (in.ttl != out->ttl) + fprintf(stderr, "=> ERROR: ttl does not match\n"); + else if (in.rdlength != out->rdlength) + fprintf(stderr, "=> ERROR: rdlength does not match\n"); + else if (memcmp(in.rdata, out->rdata, in.rdlength) != 0) + fprintf(stderr, "=> ERROR: rdata does not match\n"); + else + fprintf(stderr, "=> OK\n"); + + fprintf(stderr, "\n"); + msgb_free(msg); + talloc_free(out); + } +} + +static uint8_t ip_v4_n[] = {23, 42, 47, 11}; +static uint8_t ip_v6_n[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, + 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00}; + + +enum test_records { + RECORD_NONE, + RECORD_A, + RECORD_AAAA, + RECORD_TXT_AGE, + RECORD_TXT_PORT_444, + RECORD_TXT_PORT_666, + RECORD_TXT_INVALID_KEY, + RECORD_TXT_INVALID_NO_KEY_VALUE, + RECORD_INVALID, +}; +struct result_from_answer_test { + const char *desc; + const enum test_records records[5]; + bool error; + const struct osmo_mslookup_result res; +}; + +static void test_result_from_answer(void *ctx) +{ + void *print_ctx = talloc_named_const(ctx, 0, __func__); + struct osmo_sockaddr_str test_host_v4 = {.af = AF_INET, .port=444, .ip = "23.42.47.11"}; + struct osmo_sockaddr_str test_host_v6 = {.af = AF_INET6, .port=666, + .ip = "1122:3344:5566:7788:99aa:bbcc:ddee:ff00"}; + struct osmo_mslookup_result test_result_v4 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4}; + struct osmo_mslookup_result test_result_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v6 = test_host_v6}; + struct osmo_mslookup_result test_result_v4_v6 = {.rc = OSMO_MSLOOKUP_RC_RESULT, .age = 3, + .host_v4 = test_host_v4, .host_v6 = test_host_v6}; + struct result_from_answer_test result_from_answer_data[] = { + { + .desc = "IPv4", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444}, + .res = test_result_v4 + }, + { + .desc = "IPv6", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v6 + }, + { + .desc = "IPv4 + IPv6", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_AAAA, RECORD_TXT_PORT_666}, + .res = test_result_v4_v6 + }, + { + .desc = "A twice", + .records = {RECORD_TXT_AGE, RECORD_A, RECORD_TXT_PORT_444, RECORD_A}, + .error = true + }, + { + .desc = "AAAA twice", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_444, RECORD_AAAA}, + .error = true + }, + { + .desc = "invalid TXT: no key/value pair", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_NO_KEY_VALUE}, + .error = true + }, + { + .desc = "age twice", + .records = {RECORD_TXT_AGE, RECORD_TXT_AGE}, + .error = true + }, + { + .desc = "port as first record", + .records = {RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "port without previous ip record", + .records = {RECORD_TXT_AGE, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "invalid TXT: invalid key", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_INVALID_KEY}, + .error = true + }, + { + .desc = "unexpected record type", + .records = {RECORD_TXT_AGE, RECORD_INVALID}, + .error = true + }, + { + .desc = "missing record: age", + .records = {RECORD_A, RECORD_TXT_PORT_444}, + .error = true + }, + { + .desc = "missing record: port for ipv4", + .records = {RECORD_TXT_AGE, RECORD_A}, + .error = true + }, + { + .desc = "missing record: port for ipv4 #2", + .records = {RECORD_TXT_AGE, RECORD_AAAA, RECORD_TXT_PORT_666, RECORD_A}, + .error = true + }, + }; + int i = 0; + int j = 0; + + fprintf(stderr, "-- %s --\n", __func__); + for (i = 0; i < ARRAY_SIZE(result_from_answer_data); i++) { + struct result_from_answer_test *t = &result_from_answer_data[i]; + struct osmo_mdns_msg_answer ans = {0}; + struct osmo_mslookup_result res = {0}; + void *ctx_test = talloc_named_const(ctx, 0, t->desc); + bool is_error; + + fprintf(stderr, "---\n"); + fprintf(stderr, "test: %s\n", t->desc); + fprintf(stderr, "error: %s\n", t->error ? "true" : "false"); + fprintf(stderr, "records:\n"); + /* Build records list */ + INIT_LLIST_HEAD(&ans.records); + for (j = 0; j < ARRAY_SIZE(t->records); j++) { + struct osmo_mdns_record *rec = NULL; + + switch (t->records[j]) { + case RECORD_NONE: + break; + case RECORD_A: + fprintf(stderr, "- A 42.42.42.42\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_A; + rec->data = ip_v4_n; + rec->length = sizeof(ip_v4_n); + break; + case RECORD_AAAA: + fprintf(stderr, "- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00\n"); + rec = talloc_zero(ctx_test, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_AAAA; + rec->data = ip_v6_n; + rec->length = sizeof(ip_v6_n); + break; + case RECORD_TXT_AGE: + fprintf(stderr, "- TXT age=3\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "age", "3"); + break; + case RECORD_TXT_PORT_444: + fprintf(stderr, "- TXT port=444\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "444"); + break; + case RECORD_TXT_PORT_666: + fprintf(stderr, "- TXT port=666\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "port", "666"); + break; + case RECORD_TXT_INVALID_KEY: + fprintf(stderr, "- TXT hello=world\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "hello", "world"); + break; + case RECORD_TXT_INVALID_NO_KEY_VALUE: + fprintf(stderr, "- TXT 12345\n"); + rec = osmo_mdns_record_txt_keyval_encode(ctx_test, "12", "45"); + rec->data[3] = '3'; + break; + case RECORD_INVALID: + fprintf(stderr, "- (invalid)\n"); + rec = talloc_zero(ctx, struct osmo_mdns_record); + rec->type = OSMO_MDNS_RFC_RECORD_TYPE_UNKNOWN; + break; + } + + if (rec) + llist_add_tail(&rec->list, &ans.records); + } + + /* Verify output */ + is_error = (osmo_mdns_result_from_answer(&res, &ans) != 0); + if (t->error != is_error) { + fprintf(stderr, "got %s\n", is_error ? "error" : "no error"); + OSMO_ASSERT(false); + } + if (!t->error) { + fprintf(stderr, "exp: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &t->res)); + fprintf(stderr, "res: %s\n", osmo_mslookup_result_name_c(print_ctx, NULL, &res)); + OSMO_ASSERT(t->res.rc == res.rc); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v4, &res.host_v4)); + OSMO_ASSERT(!osmo_sockaddr_str_cmp(&t->res.host_v6, &res.host_v6)); + OSMO_ASSERT(t->res.age == res.age); + OSMO_ASSERT(t->res.last == res.last); + } + + talloc_free(ctx_test); + fprintf(stderr, "=> OK\n"); + } +} + +int main() +{ + void *ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + + test_enc_dec_rfc_qname(ctx); + test_enc_dec_rfc_header(); + test_enc_dec_rfc_header_einval(); + test_enc_dec_rfc_question(ctx); + test_enc_dec_rfc_question_null(ctx); + test_enc_dec_rfc_record(ctx); + + test_result_from_answer(ctx); + + return 0; +} diff --git a/tests/mslookup/mdns_test.err b/tests/mslookup/mdns_test.err new file mode 100644 index 0000000..51e5afe --- /dev/null +++ b/tests/mslookup/mdns_test.err @@ -0,0 +1,336 @@ +-- test_enc_dec_rfc_qname -- +domain: "hlr.1234567.imsi" +exp: "\3hlr\a1234567\4imsi" +res: "\3hlr\a1234567\4imsi" +=> OK + +qname: "\3hlr\a1234567\4imsi" +exp: "hlr.1234567.imsi" +res: "hlr.1234567.imsi" +=> OK + +domain: "hlr..imsi" +exp: NULL +res: NULL +=> OK + +domain: "hlr" +exp: "\3hlr" +res: "\3hlr" +=> OK + +qname: "\3hlr" +exp: "hlr" +res: "hlr" +=> OK + +domain: "hlr." +exp: NULL +res: NULL +=> OK + +domain: ".hlr" +exp: NULL +res: NULL +=> OK + +domain: "" +exp: NULL +res: NULL +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +exp: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +res: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\512345" +exp: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +res: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345" +=> OK + +domain: "123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.12345toolong" +exp: NULL +res: NULL +=> OK + +qname: "\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\t123456789\ +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\a1234567\5imsi" +exp: NULL +res: NULL +=> OK + +qname: "\2hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +qname: "\3hlr\3" +exp: NULL +res: NULL +=> OK + +qname_max_len: 17 +qname: "\3hlr\a1234567\4imsi" +exp: NULL +res: NULL +=> OK + +-- test_enc_dec_rfc_header -- +header in: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +encoded: 05 39 00 00 00 01 00 00 00 00 00 00 +header out: +.id = 1337 +.qr = 0 +.opcode = 0 +.aa = 0 +.tc = 0 +.rd = 0 +.ra = 0 +.z = 0 +.rcode = 0 +.qdcount = 1 +.ancount = 0 +.nscount = 0 +.arcount = 0 +in (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +out (hexdump): 39 05 00 00 01 00 00 00 00 00 00 00 +=> OK + +header in: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +encoded: 00 2a 97 a3 04 d2 04 57 08 ae 0d 05 +header out: +.id = 42 +.qr = 1 +.opcode = 2 +.aa = 1 +.tc = 1 +.rd = 1 +.ra = 1 +.z = 2 +.rcode = 3 +.qdcount = 1234 +.ancount = 1111 +.nscount = 2222 +.arcount = 3333 +in (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +out (hexdump): 2a 00 97 a3 d2 04 57 04 ae 08 05 0d +=> OK + +-- test_enc_dec_rfc_header_einval -- +=> OK + +-- test_enc_dec_rfc_question -- +question in: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 ff 00 01 +question out: +.domain = hlr.1234567.imsi +.qtype = 255 +.qclass = 1 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 1 +.qclass = 255 +=> OK + +question in: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 1c 00 ff +question out: +.domain = hlr.1234567.imsi +.qtype = 28 +.qclass = 255 +=> OK + +-- test_enc_dec_rfc_question_null -- +=> OK + +-- test_enc_dec_rfc_record -- +question in: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +encoded: 03 68 6c 72 07 31 32 33 34 35 36 37 04 69 6d 73 69 00 00 01 00 01 00 00 04 d2 00 09 31 30 2e 34 32 2e 32 2e 31 +record_len: 37 +question out: +.domain = hlr.1234567.imsi +.type = 1 +.class = 1 +.ttl = 1234 +.rdlength = 9 +.rdata = "10.42.2.1" +=> OK + +-- test_result_from_answer -- +--- +test: IPv4 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +exp: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 (age=3) (not-last) +=> OK +--- +test: IPv6 +error: false +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: IPv4 + IPv6 +error: false +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +exp: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +res: -> ipv4: 23.42.47.11:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +=> OK +--- +test: A twice +error: true +records: +- TXT age=3 +- A 42.42.42.42 +- TXT port=444 +- A 42.42.42.42 +DLGLOBAL ERROR 'A' record found twice in mDNS answer +=> OK +--- +test: AAAA twice +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=444 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +DLGLOBAL ERROR 'AAAA' record found twice in mDNS answer +=> OK +--- +test: invalid TXT: no key/value pair +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT 12345 +DLGLOBAL ERROR failed to decode txt record +=> OK +--- +test: age twice +error: true +records: +- TXT age=3 +- TXT age=3 +DLGLOBAL ERROR duplicate 'TXT' record for 'age' +=> OK +--- +test: port as first record +error: true +records: +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: port without previous ip record +error: true +records: +- TXT age=3 +- TXT port=444 +DLGLOBAL ERROR 'TXT' record for 'port' without previous 'A' or 'AAAA' record +=> OK +--- +test: invalid TXT: invalid key +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT hello=world +DLGLOBAL ERROR unexpected key 'hello' in TXT record +=> OK +--- +test: unexpected record type +error: true +records: +- TXT age=3 +- (invalid) +DLGLOBAL ERROR unexpected record type +=> OK +--- +test: missing record: age +error: true +records: +- A 42.42.42.42 +- TXT port=444 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 +error: true +records: +- TXT age=3 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK +--- +test: missing record: port for ipv4 #2 +error: true +records: +- TXT age=3 +- AAAA 1122:3344:5566:7788:99aa:bbcc:ddee:ff00 +- TXT port=666 +- A 42.42.42.42 +DLGLOBAL ERROR missing resource records in mDNS answer +=> OK diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c new file mode 100644 index 0000000..f33ef98 --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -0,0 +1,255 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void *ctx = NULL; + +#define TEST_IP OSMO_MSLOOKUP_MDNS_IP4 +#define TEST_PORT OSMO_MSLOOKUP_MDNS_PORT +#define TEST_DOMAIN_SUFFIX "mslookup_client_mdns_test.dgsm.osmocom.org" + +/* + * Test server (emulates the mDNS server in OsmoHLR) and client + */ +struct osmo_mdns_sock *server_mc; + + +static void server_reply(struct osmo_mslookup_query *query, uint16_t packet_id) +{ + struct osmo_mslookup_result result = {0}; + struct msgb *msg; + + result.rc = OSMO_MSLOOKUP_RC_RESULT; + result.age = 3; + osmo_sockaddr_str_from_str(&result.host_v4, "42.42.42.42", 444); + osmo_sockaddr_str_from_str(&result.host_v6, "1122:3344:5566:7788:99aa:bbcc:ddee:ff00", 666); + + msg = osmo_mdns_result_encode(ctx, packet_id, query, &result, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(msg); + OSMO_ASSERT(osmo_mdns_sock_send(server_mc, msg) == 0); +} + +static int server_recv(struct osmo_fd *osmo_fd, unsigned int what) +{ + int n; + uint8_t buffer[1024]; + uint16_t packet_id; + struct osmo_mslookup_query *query; + + fprintf(stderr, "%s\n", __func__); + + /* Parse the message and print it */ + n = read(osmo_fd->fd, buffer, sizeof(buffer)); + OSMO_ASSERT(n >= 0); + + query = osmo_mdns_query_decode(ctx, buffer, n, &packet_id, TEST_DOMAIN_SUFFIX); + if (!query) + return -1; /* server receiving own answer is expected */ + + fprintf(stderr, "received request\n"); + server_reply(query, packet_id); + talloc_free(query); + return n; +} + +static void server_init() +{ + fprintf(stderr, "%s\n", __func__); + server_mc = osmo_mdns_sock_init(ctx, TEST_IP, TEST_PORT, server_recv, NULL, 0); + OSMO_ASSERT(server_mc); +} + +static void server_stop() +{ + fprintf(stderr, "%s\n", __func__); + OSMO_ASSERT(server_mc); + osmo_mdns_sock_cleanup(server_mc); + server_mc = NULL; +} + +struct osmo_mslookup_client* client; +struct osmo_mslookup_client_method* client_method; + +static void client_init() +{ + fprintf(stderr, "%s\n", __func__); + client = osmo_mslookup_client_new(ctx); + OSMO_ASSERT(client); + client_method = osmo_mslookup_client_add_mdns(client, TEST_IP, TEST_PORT, 1337, TEST_DOMAIN_SUFFIX); + OSMO_ASSERT(client_method); +} + +static void client_recv(struct osmo_mslookup_client *client, uint32_t request_handle, + const struct osmo_mslookup_query *query, const struct osmo_mslookup_result *result) +{ + char buf[256]; + fprintf(stderr, "%s\n", __func__); + fprintf(stderr, "client_recv(): %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, result)); + + osmo_mslookup_client_request_cancel(client, request_handle); +} + +static void client_query() +{ + struct osmo_mslookup_id id = {.type = OSMO_MSLOOKUP_ID_IMSI, + .imsi = "123456789012345"}; + const struct osmo_mslookup_query query = { + .service = "gsup.hlr", + .id = id, + }; + struct osmo_mslookup_query_handling handling = { + .result_timeout_milliseconds = 2000, + .result_cb = client_recv, + }; + + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_request(client, &query, &handling); +} + +static void client_stop() +{ + fprintf(stderr, "%s\n", __func__); + osmo_mslookup_client_free(client); + client = NULL; +} +const struct timeval fake_time_start_time = { 0, 0 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + LOGP(DMSLOOKUP, LOGL_DEBUG, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +static void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} +static void test_server_client() +{ + fprintf(stderr, "-- %s --\n", __func__); + server_init(); + client_init(); + client_query(); + + /* Let the server receive the query and indirectly call server_recv(). As side effect of using the same IP and + * port, the client will also receive its own question. The client will dismiss its own question, as it is just + * looking for answers. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Let the mslookup client receive the answer (also same side effect as above). It does not call the callback + * (client_recv()) just yet, because it is waiting for the best result within two seconds. */ + OSMO_ASSERT(osmo_select_main_ctx(1) == 1); + + /* Time flies by, client_recv() gets called. */ + fake_time_passes(5, 0); + + server_stop(); + client_stop(); +} + +bool is_multicast_enabled() +{ + bool ret = true; + struct addrinfo *ai; + int sock; + struct addrinfo hints = {0}; + struct ip_mreq multicast_req = {0}; + in_addr_t iface = INADDR_ANY; + + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = (AI_PASSIVE | AI_NUMERICHOST); + assert(getaddrinfo("239.192.23.42", "4266", &hints, &ai) == 0); + + sock = socket(ai->ai_family, ai->ai_socktype, 0); + assert(sock != -1); + assert(setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)) != -1); + + memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ai->ai_addr))->sin_addr, + sizeof(multicast_req.imr_multiaddr)); + multicast_req.imr_interface.s_addr = htonl(INADDR_ANY); + + if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)) == -1) + ret = false; + + freeaddrinfo(ai); + return ret; +} + +/* + * Run all tests + */ +int main() +{ + if (!is_multicast_enabled()) { + fprintf(stderr, "WARNING: multicast is disabled, skipping the test! (OS#4361)"); + return 77; + } + + talloc_enable_null_tracking(); + ctx = talloc_named_const(NULL, 0, "main"); + osmo_init_logging2(ctx, NULL); + + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_level(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_category_filter(osmo_stderr_target, DMSLOOKUP, true, LOGL_DEBUG); + + fake_time_start(); + + test_server_client(); + + log_fini(); + + OSMO_ASSERT(talloc_total_blocks(ctx) == 1); + talloc_free(ctx); + OSMO_ASSERT(talloc_total_blocks(NULL) == 1); + talloc_disable_null_tracking(); + + return 0; +} diff --git a/tests/mslookup/mslookup_client_mdns_test.err b/tests/mslookup/mslookup_client_mdns_test.err new file mode 100644 index 0000000..b4ea269 --- /dev/null +++ b/tests/mslookup/mslookup_client_mdns_test.err @@ -0,0 +1,14 @@ +Total time passed: 0.000000 s +-- test_server_client -- +server_init +client_init +client_query +sending mDNS query: gsup.hlr.123456789012345.imsi +server_recv +received request +server_recv +client_recv +client_recv(): gsup.hlr.123456789012345.imsi -> ipv4: 42.42.42.42:444 -> ipv6: [1122:3344:5566:7788:99aa:bbcc:ddee:ff00]:666 (age=3) (not-last) +Total time passed: 5.000000 s +server_stop +client_stop diff --git a/tests/testsuite.at b/tests/testsuite.at index 39df7aa..827e9f8 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -40,6 +40,12 @@ AT_CHECK([$abs_srcdir/db_upgrade/db_upgrade_test.sh $abs_srcdir/db_upgrade $abs_builddir/db_upgrade], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([mdns]) +AT_KEYWORDS([mdns]) +cat $abs_srcdir/mslookup/mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mdns_test], [0], [ignore], [experr]) +AT_CLEANUP + AT_SETUP([mslookup]) AT_KEYWORDS([mslookup]) cat $abs_srcdir/mslookup/mslookup_test.err > experr @@ -51,3 +57,9 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP + +AT_SETUP([mslookup_client_mdns]) +AT_KEYWORDS([mslookup_client_mdns]) +cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr +AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3c340627181b632dd6a0d577aa2ea2a7cd035c0c Gerrit-Change-Number: 16835 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:26:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:26:07 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program (#2) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16836 ) Change subject: add osmo-mslookup-client program (#2) ...................................................................... add osmo-mslookup-client program (#2) Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Resubmit of 637bbfcd9275f8c47212b29b50110f56ba6397bf after revert in 41fe3625915c456513544b99ba8c057c0f650b3c. Change-Id: Ie39d30e20461ab10ae3584863d8bfc6b76a12f37 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 957 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index eec364a..0965935 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ src/osmo-hlr-db-tool src/osmo-euse-demo src/gsupclient/gsup-test-client +src/mslookup/osmo-mslookup-client tests/atconfig tests/testsuite diff --git a/configure.ac b/configure.ac index 57aecba..59261e8 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/dgsm/Makefile tests/Makefile tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3439c97..cfd0b15 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1 +1,4 @@ -SUBDIRS = systemd +SUBDIRS = \ + systemd \ + dgsm \ + $(NULL) diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am new file mode 100644 index 0000000..c759302 --- /dev/null +++ b/contrib/dgsm/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + osmo-mslookup-pipe.py \ + osmo-mslookup-socket.py \ + $(NULL) diff --git a/contrib/dgsm/osmo-mslookup-pipe.py b/contrib/dgsm/osmo-mslookup-pipe.py new file mode 100755 index 0000000..b18bf5f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-pipe.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import subprocess +import json + +def query_mslookup(query_str): + result = {'result': 'not-found'} + proc = subprocess.Popen(('osmo-mslookup-client', '-f', 'json', query_str), + stdout=subprocess.PIPE) + for line in iter(proc.stdout.readline,''): + if not line: + break + response = json.loads(line) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup(query_str)) diff --git a/contrib/dgsm/osmo-mslookup-socket.py b/contrib/dgsm/osmo-mslookup-socket.py new file mode 100755 index 0000000..a26ad9f --- /dev/null +++ b/contrib/dgsm/osmo-mslookup-socket.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# vim: shiftwidth=4 tabstop=4 expandtab +import socket +import time + +MSLOOKUP_SOCKET_PATH = '/tmp/mslookup' + +def query_mslookup_socket(query_str, socket_path=MSLOOKUP_SOCKET_PATH): + mslookup_socket = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) + mslookup_socket.setblocking(True) + mslookup_socket.connect(socket_path) + result = {'result': 'not-found'} + column_names = mslookup_socket.recv(1024).decode('ascii') + if not column_names: + return result + column_names = column_names.split('\t') + mslookup_socket.sendall(query_str.encode('ascii')) + while True: + csv = mslookup_socket.recv(1024).decode('ascii') + if not csv: + break + response = dict(zip(column_names, csv.split('\t'))) + if response.get('result') == 'result': + result = response + print('Response: %r' % response) + return result + +if __name__ == '__main__': + import sys + print( + '\nPlease run separately: osmo-mslookup-client --socket /tmp/mslookup -d\n') + query_str = '1000-5000 at sip.voice.12345.msisdn' + if len(sys.argv) > 1: + query_str = sys.argv[1] + print('Final result: %r' % query_mslookup_socket(query_str)) diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index 07fb6f4..a720c40 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -26,3 +26,12 @@ $(LIBOSMOGSM_LIBS) \ $(TALLOC_LIBS) \ $(NULL) + +bin_PROGRAMS = osmo-mslookup-client +osmo_mslookup_client_SOURCES = osmo-mslookup-client.c +osmo_mslookup_client_LDADD = \ + libosmo-mslookup.la \ + $(LIBOSMOCORE_LIBS) \ + $(TALLOC_LIBS) \ + $(NULL) +osmo_mslookup_client_CFLAGS = $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c new file mode 100644 index 0000000..1c0efe9 --- /dev/null +++ b/src/mslookup/osmo-mslookup-client.c @@ -0,0 +1,879 @@ +/*! \file osmo-mslookup-client.c + * Distributed GSM: find the location of subscribers, for example by multicast DNS, + * to obtain HLR, SIP or SMPP server addresses (or arbitrary service names). + */ +/* + * (C) 2019 by sysmocom s.f.m.c. GmbH + * (C) 2019 by Neels Hofmeyr + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CSV_HEADERS "query\tresult\tlast\tage\tv4_ip\tv4_port\tv6_ip\tv6_port" + +static void print_version(void) +{ + printf("osmo-mslookup-client version %s\n", PACKAGE_VERSION); + printf("\n" + "Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH\n" + "Copyright (C) 2019 by Neels Hofmeyr \n" + "This program is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + "\n"); +} + +static void print_help() +{ + print_version(); + printf( +"Standalone mslookup client for Distributed GSM\n" +"\n" +"Receiving mslookup results means listening for responses on a socket. Often,\n" +"integration (e.g. FreeSwitch dialplan.py) makes it hard to select() on a socket\n" +"to read responses, because that interferes with the main program (e.g.\n" +"FreeSwitch's dialplan.py seems to be integrated with an own select() main loop\n" +"that interferes with osmo_select_main(), or an smpp.py uses\n" +"smpplib.client.listen() as main loop, etc.).\n" +"\n" +"This program provides a trivial solution, by outsourcing the mslookup main loop\n" +"to a separate process. Communication is done via cmdline arg and stdout pipe or\n" +"a (blocking) unix domain socket, results are returned in CSV or JSON format.\n" +"\n" +"This can be done one-shot, i.e. exit as soon as the response has been\n" +"determined, or in daemon form, i.e. continuously listen for requests and return\n" +"responses.\n" +"\n" +"About running a local daemon: it is unintuitive to connect to a socket to solve\n" +"a problem of reading from a socket -- it seems like just more of the same\n" +"problem. The reasons why the daemon is in fact useful are:\n" +"- The osmo-mslookup-client daemon will return only those results matching\n" +" requests issued on that socket connection.\n" +"- A program can simply blockingly recv() from the osmo-mslookup-client socket\n" +" instead of needing to run osmo_select_main() so that libosmo-mslookup is able\n" +" to asynchronously receive responses from remote servers.\n" +"- Only one long-lived multicast socket needs to be opened instead of a new\n" +" socket for each request.\n" +"\n" +"Output is in CSV or json, see --format. The default is tab-separated CSV\n" +"with these columns:\n" +CSV_HEADERS "\n" +"\n" +"One-shot operation example:\n" +"$ osmo-mslookup-client 1000- at sip.voice.12345.msisdn -f json\n" +"{\"query\": \"sip.voice.12345.msisdn\", \"result\": \"result\", \"last\": true, \"age\": 5, \"v4\": [\"1.2.3.7\", \"23\"]}\n" +"$\n" +"\n" +"Daemon operation example:\n" +"$ osmo-mslookup-client -s /tmp/mslookup -d\n" +"(and a client program then connects to /tmp/mslookup, find an implementation\n" +"example below)\n" +"\n" +"Integrating with calling programs can be done by:\n" +"- call osmo-mslookup-client with the query string as argument.\n" +" It will open a multicast DNS socket, send out a query and wait for the\n" +" matching response. It will print the result on stdout and exit.\n" +" This method launches a new process for every mslookup query,\n" +" and creates a short-lived multicast listener for each invocation.\n" +" This is fine for low activity, but does not scale well.\n" +"\n" +"- invoke osmo-mslookup-client --socket /tmp/mslookup -d.\n" +" Individual queries can be sent by connecting to that unix domain socket,\n" +" blockingly reading the response when it arrives and disconnecting.\n" +" This way only one process keeps one multicast listener open.\n" +" Callers can connect to this socket without spawning processes.\n" +" This is recommended for scale.\n" +"\n" +"Python example clients for {CSV,JSON}x{cmdline,socket} can be found here:\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-pipe.py\n" +"http://git.osmocom.org/osmo-hlr/tree/contrib/dgsm/osmo-mslookup-socket.py\n" +"\n" +"\n" +"Options:\n" +"\n" +"[[delay-][timeout]@]service.number.id\n" +" A service query string with optional individual timeout.\n" +" The same format is also used on a daemon socket, if any.\n" +" The timeout consists of the min-delay and the timeout numbers,\n" +" corresponding to the --min-delay and --timeout options, in milliseconds.\n" +" These options apply if a query string lacks own numbers.\n" +" Examples:\n" +" gsup.hlr.1234567.imsi Use cmdline timeout settings\n" +" 5000 at gsup.hlr.1234567.imsi Return N results for 5 seconds\n" +" 1000-5000 at sip.voice.123.msisdn Same, but silent for first second\n" +" 10000- at smpp.sms.567.msisdn Return 1 result after 10 seconds\n" +"\n" +"--format -f csv (default)\n" +" Format result lines in CSV format.\n" +"--no-csv-headers -H\n" +" If the format is 'csv', by default, the first output line prints the\n" +" CSV headers used for CSV output format. This option disables these CSV\n" +" headers.\n" +"\n" +"--format -f json\n" +" Format result lines in json instead of semicolon separated, like:\n" +" {\"query\": \"sip.voice.12345.msisdn\", \"result\": \"ok\", \"v4\": [\"10.9.8.7\", \"5060\"]}\n" +"\n" +"--daemon -d\n" +" Keep running after a request has been serviced\n" +"\n" +"--mdns-ip -m " OSMO_MSLOOKUP_MDNS_IP4 " -m " OSMO_MSLOOKUP_MDNS_IP6 "\n" +"--mdns-port -M " OSMO_STRINGIFY_VAL(OSMO_MSLOOKUP_MDNS_PORT) "\n" +" Set multicast IP address / port to send mDNS requests and listen for\n" +" mDNS reponses\n" +"--mdns-domain-suffix -D " OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT "\n" +" Append this suffix to each mDNS query's domain to avoid colliding with the\n" +" top-level domains administrated by IANA.\n" +"\n" +"--min-delay -t 1000 (in milliseconds)\n" +" Set minimum delay to wait before returning any results.\n" +" When this timeout has elapsed, the best current result is returned,\n" +" if any is available.\n" +" Responses arriving after the min-delay has elapsed which have a younger\n" +" age than previous results are returned immediately.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--timeout -T 1000 (in milliseconds)\n" +" Set timeout after which to stop listening for responses.\n" +" If this is smaller than -t, the value from -t will be used for -T as well.\n" +" Note: When a response with age of zero comes in, the result is returned\n" +" immediately and the request is discarded: non-daemon mode exits, daemon\n" +" mode ignores later results.\n" +"\n" +"--socket -s /path/to/unix-domain-socket\n" +" Listen to requests from and write responses to a UNIX domain socket.\n" +"\n" +"--send -S \n" +" Do not query, but send an mslookup result. This is useful only for\n" +" testing. Examples:\n" +" --send foo.123.msisdn 300 23.42.17.11 1234\n" +" --send foo.123.msisdn 300 2323:4242:1717:1111::42 1234\n" +" --send foo.123.msisdn 300 23.42.17.11 1234 2323:4242:1717:1111::42 1234\n" +"\n" +"--quiet -q\n" +" Do not print errors to stderr, do not log to stderr.\n" +"\n" +"--help -h\n" +" This help\n" +); +} + +enum result_format { + FORMAT_CSV = 0, + FORMAT_JSON, +}; + +static struct { + bool daemon; + struct osmo_sockaddr_str mdns_addr; + uint32_t min_delay; + uint32_t timeout; + const char *socket_path; + const char *format_str; + const char *mdns_domain_suffix; + bool csv_headers; + bool send; + bool quiet; +} cmdline_opts = { + .mdns_addr = { .af=AF_INET, .ip=OSMO_MSLOOKUP_MDNS_IP4, .port=OSMO_MSLOOKUP_MDNS_PORT }, + .min_delay = 1000, + .timeout = 1000, + .csv_headers = true, + .mdns_domain_suffix = OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT, +}; + +#define print_error(fmt, args...) do { \ + if (!cmdline_opts.quiet) \ + fprintf(stderr, fmt, ##args); \ + } while (0) + +char g_buf[1024]; + +long long int parse_int(long long int minval, long long int maxval, const char *arg, int *rc) +{ + long long int val; + char *endptr; + if (rc) + *rc = -1; + if (!arg) + return -1; + errno = 0; + val = strtoll(arg, &endptr, 10); + if (errno || val < minval || val > maxval || *endptr) + return -1; + if (rc) + *rc = 0; + return val; +} + +int cb_doing_nothing(struct osmo_fd *fd, unsigned int what) +{ + return 0; +} + +/* --send: Just send a response, for manual testing. */ +int do_send(int argc, char ** argv) +{ + /* parse args */ +#define ARG(NR) ((argc > NR)? argv[NR] : NULL) + const char *query_str = ARG(0); + const char *age_str = ARG(1); + const char *ip_strs[2][2] = { + { ARG(2), ARG(3) }, + { ARG(4), ARG(5) }, + }; + struct osmo_mslookup_query q = {}; + struct osmo_mslookup_result r = { .rc = OSMO_MSLOOKUP_RC_RESULT }; + int i; + int rc; + void *ctx = talloc_named_const(NULL, 0, __func__); + struct osmo_mdns_sock *sock; + + if (!query_str) { + print_error("--send needs a query string like foo.123456.imsi\n"); + return 1; + } + if (osmo_mslookup_query_init_from_domain_str(&q, query_str)) { + print_error("Invalid query string '%s', need a query string like foo.123456.imsi\n", + query_str); + return 1; + } + + if (!age_str) { + print_error("--send needs an age\n"); + return 1; + } + r.age = parse_int(0, UINT32_MAX, age_str, &rc); + if (rc) { + print_error("invalid age\n"); + return 1; + } + + for (i = 0; i < 2; i++) { + struct osmo_sockaddr_str addr; + uint16_t port; + if (!ip_strs[i][0]) + continue; + port = parse_int(1, 65535, ip_strs[i][1] ? : "2342", &rc); + if (rc) { + print_error("invalid port: %s\n", ip_strs[i][1] ? : "NULL"); + return 1; + } + if (osmo_sockaddr_str_from_str(&addr, ip_strs[i][0], port)) { + print_error("invalid IP addr: %s\n", ip_strs[i][0]); + return 1; + } + if (addr.af == AF_INET) + r.host_v4 = addr; + else + r.host_v6 = addr; + } + + printf("Sending mDNS to " OSMO_SOCKADDR_STR_FMT ": %s\n", OSMO_SOCKADDR_STR_FMT_ARGS(&cmdline_opts.mdns_addr), + osmo_mslookup_result_name_c(ctx, &q, &r)); + + rc = 1; + sock = osmo_mdns_sock_init(ctx, cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + cb_doing_nothing, NULL, 0); + if (!sock) { + print_error("unable to open mDNS socket\n"); + goto exit_cleanup; + } + + struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); + if (!msg) { + print_error("unable to encode mDNS response\n"); + goto exit_cleanup; + } + + if (osmo_mdns_sock_send(sock, msg)) { + print_error("unable to send mDNS message\n"); + goto exit_cleanup; + } + + rc = 0; +exit_cleanup: + osmo_mdns_sock_cleanup(sock); + talloc_free(ctx); + return rc; +} + +static struct { + void *ctx; + unsigned int requests_handled; + struct osmo_fd socket_ofd; + struct osmo_mslookup_client *mslookup_client; + struct llist_head queries; + struct llist_head socket_clients; + enum result_format format; +} globals = { + .queries = LLIST_HEAD_INIT(globals.queries), + .socket_clients = LLIST_HEAD_INIT(globals.socket_clients), +}; + +typedef void (*formatter_t)(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r); + +void formatter_csv(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "%s", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, "\tERROR\t\t\t\t\t\t"); + else { + OSMO_STRBUF_PRINTF(sb, "\t%s", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, "\t%s", r->last ? "last" : "not-last"); + OSMO_STRBUF_PRINTF(sb, "\t%u", r->age); + switch (r->rc) { + case OSMO_MSLOOKUP_RC_RESULT: + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v4.ip, r->host_v4.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, "\t%s\t%u", r->host_v6.ip, r->host_v6.port); + else + OSMO_STRBUF_PRINTF(sb, "\t\t"); + break; + default: + OSMO_STRBUF_PRINTF(sb, "\t\t\t\t\t"); + break; + } + } +} + +void formatter_json(char *buf, size_t buflen, const char *query_str, const struct osmo_mslookup_result *r) +{ + struct osmo_strbuf sb = { .buf=buf, .len=buflen }; + OSMO_STRBUF_PRINTF(sb, "{\"query\": \"%s\"", query_str); + + if (!r) + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"ERROR\""); + else { + OSMO_STRBUF_PRINTF(sb, ", \"result\": \"%s\"", osmo_mslookup_result_code_name(r->rc)); + OSMO_STRBUF_PRINTF(sb, ", \"last\": %s", r->last ? "true" : "false"); + OSMO_STRBUF_PRINTF(sb, ", \"age\": %u", r->age); + if (r->rc == OSMO_MSLOOKUP_RC_RESULT) { + if (osmo_sockaddr_str_is_nonzero(&r->host_v4)) + OSMO_STRBUF_PRINTF(sb, ", \"v4\": [\"%s\", \"%u\"]", r->host_v4.ip, r->host_v4.port); + if (osmo_sockaddr_str_is_nonzero(&r->host_v6)) + OSMO_STRBUF_PRINTF(sb, ", \"v6\": [\"%s\", \"%u\"]", r->host_v6.ip, r->host_v6.port); + } + } + OSMO_STRBUF_PRINTF(sb, "}"); +} + +formatter_t formatters[] = { + [FORMAT_CSV] = formatter_csv, + [FORMAT_JSON] = formatter_json, +}; + +void respond_str_stdout(const char *str) { + fprintf(stdout, "%s\n", str); + fflush(stdout); +} + +void start_query_str(const char *query_str); +void start_query_strs(char **query_strs, size_t query_strs_len); + +struct socket_client { + struct llist_head entry; + struct osmo_fd ofd; + char query_str[1024]; +}; + +static void socket_client_close(struct socket_client *c) +{ + struct osmo_fd *ofd = &c->ofd; + + close(ofd->fd); + ofd->fd = -1; + osmo_fd_unregister(ofd); + + llist_del(&c->entry); + talloc_free(c); +} + +void socket_client_respond_result(struct socket_client *c, const char *response) +{ + write(c->ofd.fd, response, strlen(response)); +} + +static int socket_read_cb(struct osmo_fd *ofd) +{ + struct socket_client *c = ofd->data; + int rc; + char rxbuf[1024]; + char *query_with_timeout; + char *query_str; + char *at; + + rc = recv(ofd->fd, rxbuf, sizeof(rxbuf), 0); + if (rc == 0) + goto close; + + if (rc < 0) { + if (errno == EAGAIN) + return 0; + goto close; + } + + if (rc >= sizeof(c->query_str)) + goto close; + + rxbuf[rc] = '\0'; + query_with_timeout = strtok(rxbuf, "\r\n"); + at = strchr(query_with_timeout, '@'); + query_str = at ? at + 1 : query_with_timeout; + + if (c->query_str[0]) { + print_error("ERROR: Only one query per client connect is allowed;" + " received '%s' and '%s' on the same connection\n", + c->query_str, query_str); + formatters[globals.format](g_buf, sizeof(g_buf), query_str, NULL); + socket_client_respond_result(c, g_buf); + return 0; + } + + OSMO_STRLCPY_ARRAY(c->query_str, query_str); + start_query_str(query_with_timeout); + printf("query: %s\n", query_with_timeout); + return rc; + +close: + socket_client_close(c); + return -1; +} + +static int socket_cb(struct osmo_fd *ofd, unsigned int flags) +{ + int rc = 0; + + if (flags & BSC_FD_READ) + rc = socket_read_cb(ofd); + if (rc < 0) + return rc; + + return rc; +} + +int socket_accept(struct osmo_fd *ofd, unsigned int flags) +{ + struct socket_client *c; + struct sockaddr_un un_addr; + socklen_t len; + int rc; + + len = sizeof(un_addr); + rc = accept(ofd->fd, (struct sockaddr*)&un_addr, &len); + if (rc < 0) { + print_error("Failed to accept a new connection\n"); + return -1; + } + + c = talloc_zero(globals.ctx, struct socket_client); + OSMO_ASSERT(c); + c->ofd.fd = rc; + c->ofd.when = BSC_FD_READ; + c->ofd.cb = socket_cb; + c->ofd.data = c; + + if (osmo_fd_register(&c->ofd) != 0) { + print_error("Failed to register new connection fd\n"); + close(c->ofd.fd); + c->ofd.fd = -1; + talloc_free(c); + return -1; + } + + llist_add(&c->entry, &globals.socket_clients); + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); + + return 0; +} + +int socket_init(const char *sock_path) +{ + struct osmo_fd *ofd = &globals.socket_ofd; + int rc; + + ofd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_BIND); + if (ofd->fd < 0) { + print_error("Could not create unix socket: %s: %s\n", sock_path, strerror(errno)); + return -1; + } + + ofd->when = BSC_FD_READ; + ofd->cb = socket_accept; + + rc = osmo_fd_register(ofd); + if (rc < 0) { + print_error("Could not register listen fd: %d\n", rc); + close(ofd->fd); + return rc; + } + return 0; +} + +void socket_close() +{ + struct socket_client *c, *n; + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) + socket_client_close(c); + if (osmo_fd_is_registered(&globals.socket_ofd)) { + close(globals.socket_ofd.fd); + globals.socket_ofd.fd = -1; + osmo_fd_unregister(&globals.socket_ofd); + } +} + +struct query { + struct llist_head entry; + + char query_str[128]; + struct osmo_mslookup_query query; + uint32_t handle; +}; + +void respond_result(const char *query_str, const struct osmo_mslookup_result *r) +{ + struct socket_client *c, *n; + formatters[globals.format](g_buf, sizeof(g_buf), query_str, r); + respond_str_stdout(g_buf); + + llist_for_each_entry_safe(c, n, &globals.socket_clients, entry) { + if (!strcmp(query_str, c->query_str)) { + socket_client_respond_result(c, g_buf); + if (r->last) + socket_client_close(c); + } + } + if (r->last) + globals.requests_handled++; +} + +void respond_err(const char *query_str) +{ + respond_result(query_str, NULL); +} + +struct query *query_by_handle(uint32_t request_handle) +{ + struct query *q; + llist_for_each_entry(q, &globals.queries, entry) { + if (request_handle == q->handle) + return q; + } + return NULL; +} + +void mslookup_result_cb(struct osmo_mslookup_client *client, + uint32_t request_handle, + const struct osmo_mslookup_query *query, + const struct osmo_mslookup_result *result) +{ + struct query *q = query_by_handle(request_handle); + if (!q) + return; + respond_result(q->query_str, result); + if (result->last) { + llist_del(&q->entry); + talloc_free(q); + } +} + +void start_query_str(const char *query_str) +{ + struct query *q; + const char *domain_str = query_str; + char *at; + struct osmo_mslookup_query_handling h = { + .min_wait_milliseconds = cmdline_opts.min_delay, + .result_timeout_milliseconds = cmdline_opts.timeout, + .result_cb = mslookup_result_cb, + }; + + at = strchr(query_str, '@'); + if (at) { + int rc; + char timeouts[16]; + char *dash; + char *timeout; + + domain_str = at + 1; + + h.min_wait_milliseconds = h.result_timeout_milliseconds = 0; + + if (osmo_print_n(timeouts, sizeof(timeouts), query_str, at - query_str) >= sizeof(timeouts)) { + print_error("ERROR: timeouts part too long in query string\n"); + respond_err(domain_str); + return; + } + + dash = strchr(timeouts, '-'); + if (dash) { + char min_delay[16]; + osmo_print_n(min_delay, sizeof(min_delay), timeouts, dash - timeouts); + h.min_wait_milliseconds = parse_int(0, UINT32_MAX, min_delay, &rc); + if (rc) { + print_error("ERROR: invalid min-delay number: %s\n", min_delay); + respond_err(domain_str); + return; + } + timeout = dash + 1; + } else { + timeout = timeouts; + } + if (*timeout) { + h.result_timeout_milliseconds = parse_int(0, UINT32_MAX, timeout, &rc); + if (rc) { + print_error("ERROR: invalid timeout number: %s\n", timeout); + respond_err(domain_str); + return; + } + } + } + + if (strlen(domain_str) >= sizeof(q->query_str)) { + print_error("ERROR: query string is too long: '%s'\n", domain_str); + respond_err(domain_str); + return; + } + + q = talloc_zero(globals.ctx, struct query); + OSMO_ASSERT(q); + OSMO_STRLCPY_ARRAY(q->query_str, domain_str); + + if (osmo_mslookup_query_init_from_domain_str(&q->query, q->query_str)) { + print_error("ERROR: cannot parse query string: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + q->handle = osmo_mslookup_client_request(globals.mslookup_client, &q->query, &h); + if (!q->handle) { + print_error("ERROR: cannot send query: '%s'\n", domain_str); + respond_err(domain_str); + talloc_free(q); + return; + } + + llist_add(&q->entry, &globals.queries); +} + +void start_query_strs(char **query_strs, size_t query_strs_len) +{ + int i; + for (i = 0; i < query_strs_len; i++) + start_query_str(query_strs[i]); +} + +int main(int argc, char **argv) +{ + int rc = EXIT_FAILURE; + globals.ctx = talloc_named_const(NULL, 0, "osmo-mslookup-client"); + + osmo_init_logging2(globals.ctx, NULL); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_extended_timestamp(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + while (1) { + int c; + long long int val; + char *endptr; + int option_index = 0; + + static struct option long_options[] = { + { "format", 1, 0, 'f' }, + { "no-csv-headers", 0, 0, 'H' }, + { "daemon", 0, 0, 'd' }, + { "mdns-ip", 1, 0, 'm' }, + { "mdns-port", 1, 0, 'M' }, + { "mdns-domain-suffix", 1, 0, 'D' }, + { "timeout", 1, 0, 'T' }, + { "min-delay", 1, 0, 't' }, + { "socket", 1, 0, 's' }, + { "send", 0, 0, 'S' }, + { "quiet", 0, 0, 'q' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + {} + }; + +#define PARSE_INT(TARGET, MINVAL, MAXVAL) do { \ + int _rc; \ + TARGET = parse_int(MINVAL, MAXVAL, optarg, &_rc); \ + if (_rc) { \ + print_error("Invalid " #TARGET ": %s\n", optarg); \ + goto program_exit; \ + } \ + } while (0) + + c = getopt_long(argc, argv, "f:Hdm:M:D:t:T:s:SqhV", long_options, &option_index); + + if (c == -1) + break; + + switch (c) { + case 'f': + cmdline_opts.format_str = optarg; + break; + case 'H': + cmdline_opts.csv_headers = false; + break; + case 'd': + cmdline_opts.daemon = true; + break; + case 'm': + if (osmo_sockaddr_str_from_str(&cmdline_opts.mdns_addr, optarg, cmdline_opts.mdns_addr.port) + || !osmo_sockaddr_str_is_nonzero(&cmdline_opts.mdns_addr)) { + print_error("Invalid mDNS IP address: %s\n", optarg); + goto program_exit; + } + break; + case 'M': + PARSE_INT(cmdline_opts.mdns_addr.port, 1, 65535); + break; + case 'D': + cmdline_opts.mdns_domain_suffix = optarg; + break; + case 't': + PARSE_INT(cmdline_opts.min_delay, 0, UINT32_MAX); + break; + case 'T': + PARSE_INT(cmdline_opts.timeout, 0, UINT32_MAX); + break; + case 's': + cmdline_opts.socket_path = optarg; + break; + case 'S': + cmdline_opts.send = true; + break; + case 'q': + cmdline_opts.quiet = true; + break; + + case 'h': + print_help(); + rc = 0; + goto program_exit; + case 'V': + print_version(); + rc = 0; + goto program_exit; + + default: + /* catch unknown options *as well as* missing arguments. */ + print_error("Error in command line options. Exiting.\n"); + goto program_exit; + } + } + + if (cmdline_opts.send) { + if (cmdline_opts.daemon || cmdline_opts.format_str || cmdline_opts.socket_path) { + print_error("--send option cannot have any listening related args."); + } + rc = do_send(argc - optind, argv + optind); + goto program_exit; + } + + if (!cmdline_opts.daemon && !(argc - optind)) { + print_help(); + goto program_exit; + } + + if (cmdline_opts.daemon && !cmdline_opts.timeout) { + print_error("In daemon mode, --timeout must not be zero.\n"); + goto program_exit; + } + + if (cmdline_opts.quiet) + log_target_destroy(osmo_stderr_target); + + if (cmdline_opts.format_str) { + if (osmo_str_startswith("json", cmdline_opts.format_str)) + globals.format = FORMAT_JSON; + else if (osmo_str_startswith("csv", cmdline_opts.format_str)) + globals.format = FORMAT_CSV; + else { + print_error("Invalid format: %s\n", cmdline_opts.format_str); + goto program_exit; + } + } + + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) + respond_str_stdout(CSV_HEADERS); + + globals.mslookup_client = osmo_mslookup_client_new(globals.ctx); + if (!globals.mslookup_client + || !osmo_mslookup_client_add_mdns(globals.mslookup_client, + cmdline_opts.mdns_addr.ip, cmdline_opts.mdns_addr.port, + -1, cmdline_opts.mdns_domain_suffix)) { + print_error("Failed to start mDNS client\n"); + goto program_exit; + } + + if (cmdline_opts.socket_path) { + if (socket_init(cmdline_opts.socket_path)) + goto program_exit; + } + + start_query_strs(&argv[optind], argc - optind); + + while (1) { + osmo_select_main_ctx(0); + + if (!cmdline_opts.daemon + && globals.requests_handled + && llist_empty(&globals.queries)) + break; + } + + rc = 0; +program_exit: + osmo_mslookup_client_free(globals.mslookup_client); + socket_close(); + log_fini(); + talloc_free(globals.ctx); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie39d30e20461ab10ae3584863d8bfc6b76a12f37 Gerrit-Change-Number: 16836 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:26:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:26:19 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 24: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 13:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:26:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:26:22 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... contrib/dgsm/ add example esme and dialplan Add example scripts for the distributed GSM network: esme_dgsm.py: connect to the SMPP port of OsmoMSC A and forward SMS to the SMPP port of OsmoMSC B. The IP and port of OsmoMSC B is retrieved by the receiver's MSISDN using osmo-mslookup-client. contrib/dgsm/freeswitch_dialplan_dgsm.py: resolve the destination SIP servers of calls with osmo-mslookup-client and bridge the calls accordingly. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Related: OS#4254 Related: OS#4255 Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 --- M contrib/dgsm/Makefile.am A contrib/dgsm/esme_dgsm.py A contrib/dgsm/freeswitch_dialplan_dgsm.py 3 files changed, 237 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve diff --git a/contrib/dgsm/Makefile.am b/contrib/dgsm/Makefile.am index c759302..5392646 100644 --- a/contrib/dgsm/Makefile.am +++ b/contrib/dgsm/Makefile.am @@ -1,4 +1,6 @@ EXTRA_DIST = \ + esme_dgsm.py \ + freeswitch_dialplan_dgsm.py \ osmo-mslookup-pipe.py \ osmo-mslookup-socket.py \ $(NULL) diff --git a/contrib/dgsm/esme_dgsm.py b/contrib/dgsm/esme_dgsm.py new file mode 100755 index 0000000..75cf93d --- /dev/null +++ b/contrib/dgsm/esme_dgsm.py @@ -0,0 +1,158 @@ +#!/usr/bin/env python3 +""" +SPDX-License-Identifier: MIT +Copyright 2019 sysmocom s.f.m.c GmbH + +WARNING: this is just a proof-of-concept implementation, it blocks for every +received SMPP request and is not suitable for servicing more than one request +at a time. + +Based on esme.py from RCCN (license changed with permission from author): +https://github.com/Rhizomatica/rccn/blob/master/rccn/esme.py +Copyright 2017 keith + +Forward SMS to the receiver's SMSC, as determined with mslookup. +Requires smpplip (pip3 install --user smpplib) and osmo-mslookup-client. + +Example SMPP configuration for osmo-msc.cfg: +smpp + local-tcp-ip 127.0.0.1 2775 + policy closed + smpp-first +# outgoing to esme_dgsm.py + esme OSMPP + no alert-notifications + password foo + default-route +# incoming from esme_dgsm.py + esme ISMPP + no alert-notifications + password foo +""" +import argparse +import json +import logging +import smpplib +import subprocess +import time + + +def can_handle_pdu(pdu): + if not isinstance(pdu, smpplib.command.DeliverSM): + logging.info('PDU is not a DeliverSM, ignoring') + return False + + if int(pdu.dest_addr_ton) == smpplib.consts.SMPP_TON_INTL: + logging.info("Unable to handle SMS for %s: SMPP_TON_INTL" % + (pdu.destination_addr)) + return False + + return True + + +def query_mslookup(service_type, id, id_type='msisdn'): + query_str = '%s.%s.%s' % (service_type, id, id_type) + logging.info('mslookup: ' + query_str) + + result_line = subprocess.check_output(['osmo-mslookup-client', query_str, + '-f', 'json']) + if isinstance(result_line, bytes): + result_line = result_line.decode('ascii') + + logging.info('mslookup result: ' + result_line.rstrip()) + return json.loads(result_line) + + +def tx_sms(dst_host, dst_port, source, destination, registered_delivery, + unicode_text): + smpp_client = smpplib.client.Client(dst_host, dst_port, 90) + smpp_client.connect() + smpp_client.bind_transceiver(system_id=args.dst_id, password=args.dst_pass) + logging.info('Connected to destination SMSC (%s@%s:%s)' % (args.dst_id, + dst_host, dst_port)) + + pdu = smpp_client.send_message( + source_addr_ton=smpplib.consts.SMPP_TON_ALNUM, + source_addr_npi=smpplib.consts.SMPP_NPI_UNK, + source_addr=source.decode(), + dest_addr_ton=smpplib.consts.SMPP_TON_SBSCR, + dest_addr_npi=smpplib.consts.SMPP_NPI_ISDN, + destination_addr=destination.decode(), + short_message=unicode_text, + registered_delivery=registered_delivery, + ) + + smpp_client.unbind() + smpp_client.disconnect() + del pdu + del smpp_client + + +def rx_deliver_sm(pdu): + if not can_handle_pdu(pdu): + return smpplib.consts.SMPP_ESME_RSYSERR + + msisdn = pdu.destination_addr.decode() + logging.info("Incoming SMS for: " + msisdn) + + if args.sleep: + logging.info("Sleeping for %i seconds" % (args.sleep)) + time.sleep(args.sleep) + logging.info("Sleep done") + + result = query_mslookup("smpp.sms", msisdn) + if 'v4' not in result or not result['v4']: + logging.info('No IPv4 result from mslookup! This example only' + ' makes use of IPv4, dropping.') + return smpplib.consts.SMPP_ESME_RSYSERR + + dst_host, dst_port = result['v4'] + tx_sms(dst_host, dst_port, pdu.source_addr, + pdu.destination_addr, int(pdu.registered_delivery), + pdu.short_message) + + return smpplib.consts.SMPP_ESME_ROK + + +def smpp_bind(): + client = smpplib.client.Client(args.src_host, args.src_port, 90) + client.set_message_received_handler(rx_deliver_sm) + client.connect() + client.bind_transceiver(system_id=args.src_id, password=args.src_pass) + logging.info('Connected to source SMSC (%s@%s:%s)' % (args.src_id, + args.src_host, args.src_port)) + logging.info('Waiting for SMS...') + client.listen() + + +def main(): + global args + parser = argparse.ArgumentParser() + parser.add_argument('--src-host', default='127.0.0.1', + help='source SMSC (OsmoMSC) host (default: 127.0.0.1)') + parser.add_argument('--src-port', default=2775, type=int, + help='source SMSC (OsmoMSC) port (default: 2775)') + parser.add_argument('--src-id', default='OSMPP', + help='source system id, as configured in osmo-msc.cfg' + ' (default: OSMPP)') + parser.add_argument('--src-pass', default='foo', + help='source system password, as configured in' + ' osmo-msc.cfg (default: foo)') + parser.add_argument('--dst-id', default='ISMPP', + help='destination system id, as configured in' + ' osmo-msc.cfg (default: ISMPP)') + parser.add_argument('--dst-pass', default='foo', + help='destination system password, as configured in' + ' osmo-msc.cfg (default: foo)') + parser.add_argument('--sleep', default=0, type=float, + help='sleep time in seconds before forwarding an SMS,' + ' to test multithreading (default: 0)') + args = parser.parse_args() + + logging.basicConfig(level=logging.INFO, format='[%(asctime)s]' + ' (%(threadName)s) %(message)s', datefmt="%H:%M:%S") + smpp_bind() + + +if __name__ == "__main__": + main() diff --git a/contrib/dgsm/freeswitch_dialplan_dgsm.py b/contrib/dgsm/freeswitch_dialplan_dgsm.py new file mode 100755 index 0000000..502fa6e --- /dev/null +++ b/contrib/dgsm/freeswitch_dialplan_dgsm.py @@ -0,0 +1,77 @@ +#!/usr/bin/env python3 +""" +SPDX-License-Identifier: MIT +Copyright 2019 sysmocom s.f.m.c GmbH + +This is a freeswitch dialplan implementation, see: +https://freeswitch.org/confluence/display/FREESWITCH/mod_python + +Find the right SIP server with mslookup (depending on the destination number) +and bridge calls accordingly. +""" +import json +import subprocess + + +def query_mslookup(service_type, id, id_type='msisdn'): + query_str = '%s.%s.%s' % (service_type, id, id_type) + print('[dialplan-dgsm] mslookup: ' + query_str) + + result_line = subprocess.check_output([ + 'osmo-mslookup-client', query_str, '-f', 'json']) + if isinstance(result_line, bytes): + result_line = result_line.decode('ascii') + + print('[dialplan-dgsm] mslookup result: ' + result_line) + return json.loads(result_line) + + +def handler(session, args): + """ Handle calls: bridge to the SIP server found with mslookup. """ + print('[dialplan-dgsm] call handler') + msisdn = session.getVariable('destination_number') + + # Run osmo-mslookup-client binary. We have also tried to directly call the + # C functions with ctypes but this has lead to hard-to-debug segfaults. + try: + result = query_mslookup("sip.voice", msisdn) + + # This example only makes use of IPv4 + if not result['v4']: + print('[dialplan-dgsm] no IPv4 result from mslookup') + session.hangup('UNALLOCATED_NUMBER') + return + + sip_ip, sip_port = result['v4'] + dial_str = 'sofia/internal/sip:{}@{}:{}'.format( + msisdn, sip_ip, sip_port) + print('[dialplan-dgsm] dial_str: ' + str(dial_str)) + + session.execute('bridge', dial_str) + except: + print('[dialplan-dgsm]: exception during call handler') + session.hangup('UNALLOCATED_NUMBER') + + +def fsapi(session, stream, env, args): + """ Freeswitch refuses to load the module without this. """ + stream.write(env.serialize()) + + +def main(): + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument('id', type=int) + parser.add_argument('-i', '--id-type', default='msisdn', + help='default: "msisdn"') + parser.add_argument('-s', '--service', default='sip.voice', + help='default: "sip.voice"') + args = parser.parse_args() + + result = query_mslookup(args.service, args.id, args.id_type) + print(json.dumps(result)) + + +if __name__ == '__main__': + main() -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:26:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jan 2020 13:26:38 +0000 Subject: Change in osmo-hlr[master]: fix missing braces in LOGP_GSUP_FWD In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16792 ) Change subject: fix missing braces in LOGP_GSUP_FWD ...................................................................... fix missing braces in LOGP_GSUP_FWD Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e --- M src/hlr.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index 656f0a4..e66444d 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -542,11 +542,11 @@ static char namebuf[255]; #define LOGP_GSUP_FWD(gsup, level, fmt, args ...) \ LOGP(DMAIN, level, "Forward %s (class=%s, IMSI=%s, %s->%s): " fmt, \ - osmo_gsup_message_type_name(gsup->message_type), \ - osmo_gsup_message_class_name(gsup->message_class), \ - gsup->imsi, \ - osmo_quote_str((const char *)gsup->source_name, gsup->source_name_len), \ - osmo_quote_str_buf2(namebuf, sizeof(namebuf), (const char *)gsup->destination_name, gsup->destination_name_len), \ + osmo_gsup_message_type_name((gsup)->message_type), \ + osmo_gsup_message_class_name((gsup)->message_class), \ + (gsup)->imsi, \ + osmo_quote_str((const char *)(gsup)->source_name, (gsup)->source_name_len), \ + osmo_quote_str_buf2(namebuf, sizeof(namebuf), (const char *)(gsup)->destination_name, (gsup)->destination_name_len), \ ## args) static int read_cb_forward(struct osmo_gsup_conn *conn, struct msgb *msg, const struct osmo_gsup_message *gsup) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I8634ea8822c8ccba4081014c5540f2b6a229fc7e Gerrit-Change-Number: 16792 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:35:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 13:35:20 +0000 Subject: Change in osmo-trx[master]: smpl_buf: Fix str_code() param and print unknown error val References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16837 ) Change subject: smpl_buf: Fix str_code() param and print unknown error val ...................................................................... smpl_buf: Fix str_code() param and print unknown error val Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 --- M Transceiver52M/device/common/smpl_buf.cpp M Transceiver52M/device/common/smpl_buf.h 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/37/16837/1 diff --git a/Transceiver52M/device/common/smpl_buf.cpp b/Transceiver52M/device/common/smpl_buf.cpp index 33161bc..ceca000 100644 --- a/Transceiver52M/device/common/smpl_buf.cpp +++ b/Transceiver52M/device/common/smpl_buf.cpp @@ -154,7 +154,7 @@ return ost.str(); } -std::string smpl_buf::str_code(ssize_t code) +std::string smpl_buf::str_code(int code) { switch (code) { case ERROR_TIMESTAMP: @@ -166,6 +166,8 @@ case ERROR_OVERFLOW: return "Sample buffer: Overrun"; default: - return "Sample buffer: Unknown error"; + std::stringstream ss; + ss << "Sample buffer: Unknown error " << code; + return ss.str(); } } diff --git a/Transceiver52M/device/common/smpl_buf.h b/Transceiver52M/device/common/smpl_buf.h index ab612de..0b49b82 100644 --- a/Transceiver52M/device/common/smpl_buf.h +++ b/Transceiver52M/device/common/smpl_buf.h @@ -68,7 +68,7 @@ @param code an error code @return a formatted error string */ - static std::string str_code(ssize_t code); + static std::string str_code(int code); enum err_code { ERROR_TIMESTAMP = -1, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 Gerrit-Change-Number: 16837 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 13:35:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 13:35:20 +0000 Subject: Change in osmo-trx[master]: lms: Improve smpl_buf error logging References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16838 ) Change subject: lms: Improve smpl_buf error logging ...................................................................... lms: Improve smpl_buf error logging Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/38/16838/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b8893fb..3a10983 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -708,8 +708,9 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->read(bufs[i], len, timestamp); if ((rc < 0) || (rc != len)) { - LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc); - LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp); + LOGCHAN(i, DDEV, ERROR) << rx_buffers[i]->str_code(rc) << ". " + << rx_buffers[i]->str_status(timestamp) + << ", (len=" << len << ")"; return 0; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 Gerrit-Change-Number: 16838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:27:05 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 13 Jan 2020 14:27:05 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Trivial: code simplification, return early This commit also, (for what it is worth) removes a difference to the same file in openbsc, which I found while looking for changes that affected SMPP delivery. Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e --- M src/libmsc/gsm_04_11.c 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/16839/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 367cc6f..ae19b27 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -442,29 +442,29 @@ /* determine gsms->receiver based on dialled number */ gsms->receiver = vlr_subscr_find_by_msisdn(net->vlr, gsms->dst.addr, VSUB_USE_SMS_RECEIVER); - if (!gsms->receiver) { -#ifdef BUILD_SMPP - /* Avoid a second look-up */ - if (smpp_route_smpp_first()) { - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); - return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; - } + if (gsms->receiver) + return 0; - rc = smpp_try_deliver(gsms, msc_a); - if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) { - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); - } else if (rc < 0) { - LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc); - rc = GSM411_RP_CAUSE_MO_TEMP_FAIL; - /* rc will be logged by gsm411_send_rp_error() */ - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]); - } -#else - rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; +#ifdef BUILD_SMPP + /* Avoid a second look-up */ + if (smpp_route_smpp_first()) { rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); + return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + } + + rc = smpp_try_deliver(gsms, msc_a); + if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) { + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); + } else if (rc < 0) { + LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc); + rc = GSM411_RP_CAUSE_MO_TEMP_FAIL; + /* rc will be logged by gsm411_send_rp_error() */ + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]); + } +#else + rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); #endif - } else - rc = 0; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:27:35 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 13 Jan 2020 14:27:35 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Trivial: code simplification, return early This commit also, (for what it is worth) removes a difference to the same file in openbsc, which I found while looking for changes that affected SMPP delivery. Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e --- M src/libmsc/gsm_04_11.c 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/16839/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:31:18 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 13 Jan 2020 14:31:18 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Trivial: code simplification, return early This commit also, (for what it is worth) removes a difference to the same file in openbsc, which I found while looking for changes that affected SMPP delivery. This is essentially a "forward-port" of [1] [1] https://gerrit.osmocom.org/#/c/openbsc/+/3899/ Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e --- M src/libmsc/gsm_04_11.c 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/16839/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:40:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 14:40:11 +0000 Subject: Change in libosmocore[master]: logging.c: Add valuestrings for loglevels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16832 ) Change subject: logging.c: Add valuestrings for loglevels ...................................................................... Patch Set 1: Code-Review-1 (2 comments) I don't see how this can be useful as you don't add any use case for it in the commit description. Furthermore, we already have loglevel_strs. https://gerrit.osmocom.org/c/libosmocore/+/16832/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/16832/1/src/logging.c at 67 PS1, Line 67: const struct value_string log_level_names[] = { We already have something like that, don't re-add the same content: const struct value_string loglevel_strs[] = { { LOGL_DEBUG, "DEBUG" }, { LOGL_INFO, "INFO" }, { LOGL_NOTICE, "NOTICE" }, { LOGL_ERROR, "ERROR" }, { LOGL_FATAL, "FATAL" }, { 0, NULL }, }; https://gerrit.osmocom.org/c/libosmocore/+/16832/1/src/logging.c at 68 PS1, Line 68: { LOGL_DEBUG, "LOGL_DEBUG" }, OSMO_STRINGIFY(LOGL_DEBUG) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81e58dbae9889f1424ff107a22ed0e838bea7f5b Gerrit-Change-Number: 16832 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 14:40:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:40:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 14:40:40 +0000 Subject: Change in libosmocore[master]: logging.c: Add valuestrings for loglevels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16832 ) Change subject: logging.c: Add valuestrings for loglevels ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16832/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/16832/1/src/logging.c at 126 PS1, Line 126: const struct value_string loglevel_strs[] = { See here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81e58dbae9889f1424ff107a22ed0e838bea7f5b Gerrit-Change-Number: 16832 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 14:40:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:43:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 14:43:17 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16833/1/src/application.c File src/application.c: https://gerrit.osmocom.org/c/libosmocore/+/16833/1/src/application.c at 122 PS1, Line 122: static void check_loglevels(const struct log_info *log_info) I don't really like forcing this. I may want to create an app using libosmocore with default INFO levels. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 14:43:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:46:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 14:46:29 +0000 Subject: Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 14:46:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:48:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 14:48:03 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 14:48:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:38 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:38 +0000 Subject: Change in osmo-hlr[master]: mslookup_client.c: fix dereferencing null pointer References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16840 ) Change subject: mslookup_client.c: fix dereferencing null pointer ...................................................................... mslookup_client.c: fix dereferencing null pointer Fixes: CID#207547 Change-Id: If19e1e68fad76a3d65788ac208da7dde1f8745c1 --- M src/mslookup/mslookup_client.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/40/16840/1 diff --git a/src/mslookup/mslookup_client.c b/src/mslookup/mslookup_client.c index 67977e4..ce46296 100644 --- a/src/mslookup/mslookup_client.c +++ b/src/mslookup/mslookup_client.c @@ -146,7 +146,7 @@ if (!req) { LOGP(DMSLOOKUP, LOGL_ERROR, "Internal error: Got mslookup result for a request that does not exist (handle %u)\n", - req->request_handle); + request_handle); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If19e1e68fad76a3d65788ac208da7dde1f8745c1 Gerrit-Change-Number: 16840 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:39 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:39 +0000 Subject: Change in osmo-hlr[master]: mdns_msg.c: always call va_end References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16841 ) Change subject: mdns_msg.c: always call va_end ...................................................................... mdns_msg.c: always call va_end Fixes: CID#207546 Change-Id: I39829e78619a6412618e1140ff9b1185bad975bd --- M src/mslookup/mdns_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/41/16841/1 diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c index da65fef..78ea67a 100644 --- a/src/mslookup/mdns_msg.c +++ b/src/mslookup/mdns_msg.c @@ -213,9 +213,9 @@ va_start(ap, value_fmt); value = talloc_vasprintf(ctx, value_fmt, ap); + va_end(ap); if (!value) return NULL; - va_end(ap); r = _osmo_mdns_record_txt_encode(ctx, key, value); talloc_free(value); return r; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I39829e78619a6412618e1140ff9b1185bad975bd Gerrit-Change-Number: 16841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:40 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns.c: fix dereferencing null References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16842 ) Change subject: mslookup_client_mdns.c: fix dereferencing null ...................................................................... mslookup_client_mdns.c: fix dereferencing null Fixes: CID#207545 Change-Id: I0f7fbbdb663304bd5214cba4a6e4abe1dd165cfa --- M src/mslookup/mslookup_client_mdns.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/42/16842/1 diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c index 7ba3502..255430b 100644 --- a/src/mslookup/mslookup_client_mdns.c +++ b/src/mslookup/mslookup_client_mdns.c @@ -114,6 +114,7 @@ if (!msg) { LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + return; } /* Send over the wire */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0f7fbbdb663304bd5214cba4a6e4abe1dd165cfa Gerrit-Change-Number: 16842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:40 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client.c: fix dereferencing null References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16843 ) Change subject: osmo-mslookup-client.c: fix dereferencing null ...................................................................... osmo-mslookup-client.c: fix dereferencing null Fixes: CID#207544 Change-Id: I51b974420975e670708f0d2318f63615d281922c --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/43/16843/1 diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index 1c0efe9..fc9b56d 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -325,7 +325,8 @@ rc = 0; exit_cleanup: - osmo_mdns_sock_cleanup(sock); + if (sock) + osmo_mdns_sock_cleanup(sock); talloc_free(ctx); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I51b974420975e670708f0d2318f63615d281922c Gerrit-Change-Number: 16843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:40 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client: fix dereferencing null References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16844 ) Change subject: osmo-mslookup-client: fix dereferencing null ...................................................................... osmo-mslookup-client: fix dereferencing null Fixes: CID#207543 Change-Id: Ia9ff5b2c767853dd00f577a7bc3583f408e061b5 --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/44/16844/1 diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index fc9b56d..00677ef 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -456,6 +456,11 @@ rxbuf[rc] = '\0'; query_with_timeout = strtok(rxbuf, "\r\n"); + if (!query_with_timeout) { + print_error("ERROR: failed to read line from socket\n"); + goto close; + } + at = strchr(query_with_timeout, '@'); query_str = at ? at + 1 : query_with_timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia9ff5b2c767853dd00f577a7bc3583f408e061b5 Gerrit-Change-Number: 16844 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:40 +0000 Subject: Change in osmo-hlr[master]: mdns_sock.c: fix resource leak of sock References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16845 ) Change subject: mdns_sock.c: fix resource leak of sock ...................................................................... mdns_sock.c: fix resource leak of sock Fixes: CID#207542 Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 --- M src/mslookup/mdns_sock.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/45/16845/1 diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c index 5291660..1ca7d32 100644 --- a/src/mslookup/mdns_sock.c +++ b/src/mslookup/mdns_sock.c @@ -51,7 +51,7 @@ void *data, unsigned int priv_nr) { struct osmo_mdns_sock *ret; - int sock, rc; + int sock = -1, rc; struct addrinfo hints = {0}; struct ip_mreq multicast_req = {0}; in_addr_t iface = INADDR_ANY; @@ -117,6 +117,8 @@ return ret; error: + if (sock != -1) + close(sock); if (ret->ai) freeaddrinfo(ret->ai); talloc_free(ret); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 Gerrit-Change-Number: 16845 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 14:57:41 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 13 Jan 2020 14:57:41 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... mdns_rfc.c: fix possible access of uninit. mem Fixes: CID#207548 Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 --- M src/mslookup/mdns_rfc.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/46/16846/1 diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c index e1fc184..6f39a8e 100644 --- a/src/mslookup/mdns_rfc.c +++ b/src/mslookup/mdns_rfc.c @@ -83,7 +83,12 @@ return NULL; while (*qname) { - size_t len = *qname; + size_t len; + + if (i >= qname_max_len) + return NULL; + + len = *qname; next_label = qname + len + 1; if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:04:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:04:38 +0000 Subject: Change in osmo-trx[master]: lms: Change radiODevice constructor arg name to avoid masking instanc... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16847 ) Change subject: lms: Change radiODevice constructor arg name to avoid masking instance attr ...................................................................... lms: Change radiODevice constructor arg name to avoid masking instance attr channel number mangling based on multi-arfcn feature being enabled was moved to generic radioDevice() to reuse code. Hence, the generic parent constructor sets this->chans to 1 if multi-arfcn feature is requested. However, LMSDevice constructor argument had same name as the class instance attribute, taking preference. As a result, if multi-arfcn is enabled in LMSDevice, the generic constructor first sets this->chans=1 but afterwards LMSDEvice constructor keeps calling .resize() with the argument value "chans" instead of using this->chans. Let's rename the argument in all radioDevice child class constructors to avoid potential future bugs in all of them. Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 6 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/16847/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 3a10983..cb0129a 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -44,10 +44,10 @@ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) #define SAMPLE_BUF_SZ (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */ -LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, +LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), + RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), m_lms_dev(NULL), started(false) { LOGC(DDEV, INFO) << "creating LMS device..."; diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 003d064..cdba72c 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -72,7 +72,7 @@ public: /** Object constructor */ - LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, + LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); ~LMSDevice(); diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 8bab882..5d267c8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -189,10 +189,10 @@ #endif uhd_device::uhd_device(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, + InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), + : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), tx_gain_min(0.0), tx_gain_max(0.0), rx_gain_min(0.0), rx_gain_max(0.0), tx_spp(0), rx_spp(0), diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index 44f7ebb..d485a8e 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -62,7 +62,7 @@ class uhd_device : public RadioDevice { public: uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type, - size_t chans, double offset, + size_t chan_num, double offset, const std::vector& tx_paths, const std::vector& rx_paths); ~uhd_device(); diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 03a4f80..766a228 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -61,10 +61,10 @@ const double USRPDevice::masterClockRate = 52.0e6; USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, - size_t chans, double lo_offset, + size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths) + RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths) { LOGC(DDEV, INFO) << "creating USRP device..."; diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 6dfa5f0..47f2a43 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -95,7 +95,7 @@ public: /** Object constructor */ - USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, + USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:05:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:05:17 +0000 Subject: Change in osmo-hlr[master]: mslookup_client.c: fix dereferencing null pointer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16840 ) Change subject: mslookup_client.c: fix dereferencing null pointer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If19e1e68fad76a3d65788ac208da7dde1f8745c1 Gerrit-Change-Number: 16840 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:05:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:06:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:06:46 +0000 Subject: Change in osmo-hlr[master]: mdns_msg.c: always call va_end In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16841 ) Change subject: mdns_msg.c: always call va_end ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I39829e78619a6412618e1140ff9b1185bad975bd Gerrit-Change-Number: 16841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:06:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:07:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:07:49 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client: fix dereferencing null In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16844 ) Change subject: osmo-mslookup-client: fix dereferencing null ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia9ff5b2c767853dd00f577a7bc3583f408e061b5 Gerrit-Change-Number: 16844 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:07:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:08:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:08:25 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns.c: fix dereferencing null In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16842 ) Change subject: mslookup_client_mdns.c: fix dereferencing null ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0f7fbbdb663304bd5214cba4a6e4abe1dd165cfa Gerrit-Change-Number: 16842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:08:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:09:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:09:21 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client.c: fix dereferencing null In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16843 ) Change subject: osmo-mslookup-client.c: fix dereferencing null ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16843/1/src/mslookup/osmo-mslookup-client.c File src/mslookup/osmo-mslookup-client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16843/1/src/mslookup/osmo-mslookup-client.c at 328 PS1, Line 328: if (sock) Better add 2 tags, one with osmo_mds_sock_cleanup and one without. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I51b974420975e670708f0d2318f63615d281922c Gerrit-Change-Number: 16843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:09:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:10:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:10:02 +0000 Subject: Change in osmo-hlr[master]: mdns_sock.c: fix resource leak of sock In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16845 ) Change subject: mdns_sock.c: fix resource leak of sock ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16845/1/src/mslookup/mdns_sock.c File src/mslookup/mdns_sock.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16845/1/src/mslookup/mdns_sock.c at 120 PS1, Line 120: if (sock != -1) Same, use different goto tags. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 Gerrit-Change-Number: 16845 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:10:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:11:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:11:53 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16846/1/src/mslookup/mdns_rfc.c File src/mslookup/mdns_rfc.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16846/1/src/mslookup/mdns_rfc.c at 106 PS1, Line 106: memcpy(buf + i, qname + 1, len); Shouldn't a check be placed here? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 15:11:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 15:13:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 15:13:36 +0000 Subject: Change in osmo-trx[master]: lms: Change radioDevice constructor arg name to avoid masking instanc... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 to look at the new patch set (#2). Change subject: lms: Change radioDevice constructor arg name to avoid masking instance attr ...................................................................... lms: Change radioDevice constructor arg name to avoid masking instance attr channel number mangling based on multi-arfcn feature being enabled was moved to generic radioDevice() to reuse code. Hence, the generic parent constructor sets this->chans to 1 if multi-arfcn feature is requested. However, LMSDevice constructor argument had same name as the class instance attribute, taking preference. As a result, if multi-arfcn is enabled in LMSDevice, the generic constructor first sets this->chans=1 but afterwards LMSDEvice constructor keeps calling .resize() with the argument value "chans" instead of using this->chans. Let's rename the argument in all radioDevice child class constructors to avoid potential future bugs in all of them. Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 6 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/16847/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 16:29:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 16:29:53 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.20 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16848 ) Change subject: layer23: Fix build against gpsd >= 3.20 ...................................................................... layer23: Fix build against gpsd >= 3.20 During 3.19->3.20 dev cycle, some fields were transformed from timestamp_t or double to timespec_t. See for instance gpsd.git f7c230fceb6d64483757f8c32afb98e6a2cb9413. Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f --- M src/host/layer23/src/common/gps.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/16848/1 diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index 35ee416..807beed 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -82,7 +82,11 @@ g.valid = 0; /* gps is offline */ +#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0 + if (gdata->online.tv_sec || gdata->online.tv_nsec) +#else if (gdata->online) +#endif goto gps_not_ready; #if GPSD_API_MAJOR_VERSION >= 5 @@ -102,7 +106,11 @@ /* data are valid */ if (gdata->set & LATLON_SET) { g.valid = 1; +#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0 + g.gmt = gdata->fix.time.tv_sec; +#else g.gmt = gdata->fix.time; +#endif tm = localtime(&g.gmt); diff = time(NULL) - g.gmt; g.latitude = gdata->fix.latitude; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f Gerrit-Change-Number: 16848 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 17:41:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 17:41:10 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.20 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16848 ) Change subject: layer23: Fix build against gpsd >= 3.20 ...................................................................... Patch Set 1: Code-Review+2 They seem to like breaking API... -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f Gerrit-Change-Number: 16848 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 13 Jan 2020 17:41:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 20:54:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 20:54:42 +0000 Subject: Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 20:54:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 20:55:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 20:55:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 ) Change subject: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 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: Iaa7347e973ee617cc1780b84e0c298f0a302227c Gerrit-Change-Number: 16801 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 20:55:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 20:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 20:55:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 ) Change subject: MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel ...................................................................... MSC/Iu: fixup: start 16 BSC_ConnHdlr components in parallel Since Ibca0e9196c25ab00803041b81f7b490ba2f0a3ba we can have up to 16 components of type BSC_ConnHdlr running in parallel. Both TC_multi_lu_and_{mo,mt}_ussd test cases have been updated, but their Iu/UMTS siblings have not. Let's fix this. Change-Id: Iaa7347e973ee617cc1780b84e0c298f0a302227c --- M msc/MSC_Tests_Iu.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index e894598..72bbf03 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -480,7 +480,7 @@ /* Verify multiple concurrent MO SS/USSD transactions * (one subscriber - one transaction) */ testcase TC_iu_multi_lu_and_mo_ussd() runs on MTC_CT { - var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlr vc_conn[16]; var BSC_ConnHdlrPars pars; var integer i; @@ -499,14 +499,14 @@ /* Verify multiple concurrent MT SS/USSD transactions * (one subscriber - one transaction) */ testcase TC_iu_multi_lu_and_mt_ussd() runs on MTC_CT { - var BSC_ConnHdlr vc_conn[8]; + var BSC_ConnHdlr vc_conn[16]; var BSC_ConnHdlrPars pars; var integer i; f_init(3); for (i := 0; i < sizeof(vc_conn); i := i + 1) { - pars := f_init_pars(1110 + i, ran_idx := 2, ran_is_geran := false, + pars := f_init_pars(1116 + i, ran_idx := 2, ran_is_geran := false, gsup_sid := '200001'O & int2oct(i, 1)); vc_conn[i] := f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), pars); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16801 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: Iaa7347e973ee617cc1780b84e0c298f0a302227c Gerrit-Change-Number: 16801 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 21:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 21:00:44 +0000 Subject: Change in osmo-pcu[master]: VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16347 ) Change subject: VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() ...................................................................... Patch Set 2: Ok, since Ic5e69a396df659933fd4d50298b9925e837a6861 we depend on 1.3.0. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7ce8c4e1ac43747ad40a06d01433c366da07b42 Gerrit-Change-Number: 16347 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 13 Jan 2020 21:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 21:02:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jan 2020 21:02:33 +0000 Subject: Change in osmo-bsc[master]: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TE... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16352 ) Change subject: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TEI_DN ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3dc657ac5a2c5334747bd4f4db1a658acb323942 Gerrit-Change-Number: 16352 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 21:02:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 21:13:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 21:13:39 +0000 Subject: Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 21:13:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 21:15:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 21:15:35 +0000 Subject: Change in osmo-pcu[master]: VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16347 ) Change subject: VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() ...................................................................... Patch Set 2: Code-Review+1 > Patch Set 2: > > Ok, since Ic5e69a396df659933fd4d50298b9925e837a6861 we depend on 1.3.0. Please remember to say so in the commit description next time. Beter state the project version instead of the commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id7ce8c4e1ac43747ad40a06d01433c366da07b42 Gerrit-Change-Number: 16347 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 13 Jan 2020 21:15:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 13 21:17:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jan 2020 21:17:05 +0000 Subject: Change in osmo-bsc[master]: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TE... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16352 ) Change subject: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TEI_DN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3dc657ac5a2c5334747bd4f4db1a658acb323942 Gerrit-Change-Number: 16352 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jan 2020 21:17:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:29:14 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:29:14 +0000 Subject: Change in osmo-hlr[master]: mslookup_client.c: fix dereferencing null pointer In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16840 ) Change subject: mslookup_client.c: fix dereferencing null pointer ...................................................................... mslookup_client.c: fix dereferencing null pointer Fixes: CID#207547 Change-Id: If19e1e68fad76a3d65788ac208da7dde1f8745c1 --- M src/mslookup/mslookup_client.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/mslookup_client.c b/src/mslookup/mslookup_client.c index 67977e4..ce46296 100644 --- a/src/mslookup/mslookup_client.c +++ b/src/mslookup/mslookup_client.c @@ -146,7 +146,7 @@ if (!req) { LOGP(DMSLOOKUP, LOGL_ERROR, "Internal error: Got mslookup result for a request that does not exist (handle %u)\n", - req->request_handle); + request_handle); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If19e1e68fad76a3d65788ac208da7dde1f8745c1 Gerrit-Change-Number: 16840 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:29:15 +0000 Subject: Change in osmo-hlr[master]: mdns_msg.c: always call va_end In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16841 ) Change subject: mdns_msg.c: always call va_end ...................................................................... mdns_msg.c: always call va_end Fixes: CID#207546 Change-Id: I39829e78619a6412618e1140ff9b1185bad975bd --- M src/mslookup/mdns_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/mdns_msg.c b/src/mslookup/mdns_msg.c index da65fef..78ea67a 100644 --- a/src/mslookup/mdns_msg.c +++ b/src/mslookup/mdns_msg.c @@ -213,9 +213,9 @@ va_start(ap, value_fmt); value = talloc_vasprintf(ctx, value_fmt, ap); + va_end(ap); if (!value) return NULL; - va_end(ap); r = _osmo_mdns_record_txt_encode(ctx, key, value); talloc_free(value); return r; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I39829e78619a6412618e1140ff9b1185bad975bd Gerrit-Change-Number: 16841 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:29:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:29:16 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns.c: fix dereferencing null In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16842 ) Change subject: mslookup_client_mdns.c: fix dereferencing null ...................................................................... mslookup_client_mdns.c: fix dereferencing null Fixes: CID#207545 Change-Id: I0f7fbbdb663304bd5214cba4a6e4abe1dd165cfa --- M src/mslookup/mslookup_client_mdns.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/mslookup_client_mdns.c b/src/mslookup/mslookup_client_mdns.c index 7ba3502..255430b 100644 --- a/src/mslookup/mslookup_client_mdns.c +++ b/src/mslookup/mslookup_client_mdns.c @@ -114,6 +114,7 @@ if (!msg) { LOGP(DMSLOOKUP, LOGL_ERROR, "Cannot encode request: %s\n", osmo_mslookup_result_name_b(buf, sizeof(buf), query, NULL)); + return; } /* Send over the wire */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0f7fbbdb663304bd5214cba4a6e4abe1dd165cfa Gerrit-Change-Number: 16842 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:55:50 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:55:50 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16846/1/src/mslookup/mdns_rfc.c File src/mslookup/mdns_rfc.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16846/1/src/mslookup/mdns_rfc.c at 106 PS1, Line 106: memcpy(buf + i, qname + 1, len); > Shouldn't a check be placed here? There are checks above, which make sure that this is safe: "buf + i" and len: * the address that buf points to does not change in the loop * buf has size OSMO_MDNS_RFC_MAX_NAME_LEN + 1 (line 79) * check in line 94 makes sure, that buf + i + len does not write outside of buf's size "qname + 1" and len: * line 92: next_label = qname + len + 1; * line 94: if (next_label >= qname_end || ...) return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 07:55:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:57:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:57:08 +0000 Subject: Change in osmo-hlr[master]: mdns_sock.c: fix resource leak of sock In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 to look at the new patch set (#2). Change subject: mdns_sock.c: fix resource leak of sock ...................................................................... mdns_sock.c: fix resource leak of sock Fixes: CID#207542 Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 --- M src/mslookup/mdns_sock.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/45/16845/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 Gerrit-Change-Number: 16845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 07:57:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 07:57:08 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client.c: fix dereferencing null In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 to look at the new patch set (#2). Change subject: osmo-mslookup-client.c: fix dereferencing null ...................................................................... osmo-mslookup-client.c: fix dereferencing null Fixes: CID#207544 Change-Id: I51b974420975e670708f0d2318f63615d281922c --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/43/16843/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I51b974420975e670708f0d2318f63615d281922c Gerrit-Change-Number: 16843 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jan 14 09:08:15 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 14 Jan 2020 09:08:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5e1d851397406_12e32ae013cea5f421910aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 824s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 824s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 824s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 824s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 825s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 825s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 825s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 825s] dpkg-gencontrol: warning: File::FcntlLock not available; using flock which is not NFS-safe [ 825s] dh_md5sums [ 825s] dh_builddeb [ 825s] dpkg-deb: building package 'libosmo-ranap-dbg' in '../libosmo-ranap-dbg_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'libosmo-ranap3' in '../libosmo-ranap3_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'libosmo-sabp0' in '../libosmo-sabp0_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'libosmo-sabp-dev' in '../libosmo-sabp-dev_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'libosmo-sabp-dbg' in '../libosmo-sabp-dbg_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'osmo-hnbgw' in '../osmo-hnbgw_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'osmo-hnbgw-dbg' in '../osmo-hnbgw-dbg_0.6.0_amd64.deb'. [ 825s] dpkg-deb: building package 'libosmo-ranap-dev' in '../libosmo-ranap-dev_0.6.0_amd64.deb'. [ 827s] dpkg-genchanges >../osmo-iuh_0.6.0_amd64.changes [ 827s] Global symbol "$contro" requires explicit package name (did you forget to declare "my $contro"?) at /usr/bin/dpkg-genchanges line 252. [ 827s] Unrecognized character \x01; marked by <-- HERE after = $contro<-- HERE near column 25 at /usr/bin/dpkg-genchanges line 252. [ 827s] dpkg-buildpackage: error: dpkg-genchanges gave error exit status 255 [ 827s] [ 827s] lamb12 failed "build osmo-iuh_0.6.0.dsc" at Tue Jan 14 09:08:03 UTC 2020. [ 827s] [ 827s] ### VM INTERACTION START ### [ 830s] [ 817.529422] sysrq: SysRq : Power Off [ 830s] [ 817.535382] reboot: Power down [ 830s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:42:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 09:42:13 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client.c: fix dereferencing null In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16843 ) Change subject: osmo-mslookup-client.c: fix dereferencing null ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I51b974420975e670708f0d2318f63615d281922c Gerrit-Change-Number: 16843 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 09:42:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:43:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 09:43:35 +0000 Subject: Change in osmo-hlr[master]: mdns_sock.c: fix resource leak of sock In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16845 ) Change subject: mdns_sock.c: fix resource leak of sock ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 Gerrit-Change-Number: 16845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 09:43:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:44:22 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 09:44:22 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client.c: fix dereferencing null In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16843 ) Change subject: osmo-mslookup-client.c: fix dereferencing null ...................................................................... osmo-mslookup-client.c: fix dereferencing null Fixes: CID#207544 Change-Id: I51b974420975e670708f0d2318f63615d281922c --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index 1c0efe9..5f06d5f 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -315,17 +315,18 @@ struct msgb *msg = osmo_mdns_result_encode(ctx, 0, &q, &r, cmdline_opts.mdns_domain_suffix); if (!msg) { print_error("unable to encode mDNS response\n"); - goto exit_cleanup; + goto exit_cleanup_sock; } if (osmo_mdns_sock_send(sock, msg)) { print_error("unable to send mDNS message\n"); - goto exit_cleanup; + goto exit_cleanup_sock; } rc = 0; -exit_cleanup: +exit_cleanup_sock: osmo_mdns_sock_cleanup(sock); +exit_cleanup: talloc_free(ctx); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I51b974420975e670708f0d2318f63615d281922c Gerrit-Change-Number: 16843 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:44:23 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 09:44:23 +0000 Subject: Change in osmo-hlr[master]: osmo-mslookup-client: fix dereferencing null In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16844 ) Change subject: osmo-mslookup-client: fix dereferencing null ...................................................................... osmo-mslookup-client: fix dereferencing null Fixes: CID#207543 Change-Id: Ia9ff5b2c767853dd00f577a7bc3583f408e061b5 --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index 5f06d5f..4a9e587 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -456,6 +456,11 @@ rxbuf[rc] = '\0'; query_with_timeout = strtok(rxbuf, "\r\n"); + if (!query_with_timeout) { + print_error("ERROR: failed to read line from socket\n"); + goto close; + } + at = strchr(query_with_timeout, '@'); query_str = at ? at + 1 : query_with_timeout; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia9ff5b2c767853dd00f577a7bc3583f408e061b5 Gerrit-Change-Number: 16844 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:44:23 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 09:44:23 +0000 Subject: Change in osmo-hlr[master]: mdns_sock.c: fix resource leak of sock In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16845 ) Change subject: mdns_sock.c: fix resource leak of sock ...................................................................... mdns_sock.c: fix resource leak of sock Fixes: CID#207542 Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 --- M src/mslookup/mdns_sock.c 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/mslookup/mdns_sock.c b/src/mslookup/mdns_sock.c index 5291660..fbe6e82 100644 --- a/src/mslookup/mdns_sock.c +++ b/src/mslookup/mdns_sock.c @@ -84,7 +84,7 @@ rc = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, sizeof(iface)); if (rc == -1) { LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; + goto error_sock; } memcpy(&multicast_req.imr_multiaddr, &((struct sockaddr_in*)(ret->ai->ai_addr))->sin_addr, sizeof(multicast_req.imr_multiaddr)); @@ -92,7 +92,7 @@ rc = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&multicast_req, sizeof(multicast_req)); if (rc == -1) { LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; + goto error_sock; } /* Always allow binding the same IP and port twice. This is needed in OsmoHLR (where the code becomes cleaner by @@ -102,20 +102,22 @@ rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&y, sizeof(y)); if (rc == -1) { LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: setsockopt: %s\n", strerror(errno)); - goto error; + goto error_sock; } /* Bind and register osmo_fd callback */ rc = bind(sock, ret->ai->ai_addr, ret->ai->ai_addrlen); if (rc == -1) { LOGP(DMSLOOKUP, LOGL_ERROR, "osmo_mdns_sock_init: bind: %s\n", strerror(errno)); - goto error; + goto error_sock; } osmo_fd_setup(&ret->osmo_fd, sock, OSMO_FD_READ, cb, data, priv_nr); if (osmo_fd_register(&ret->osmo_fd) != 0) - goto error; + goto error_sock; return ret; +error_sock: + close(sock); error: if (ret->ai) freeaddrinfo(ret->ai); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0216b17c3ff67910a39520e2f2a5a16e23575a86 Gerrit-Change-Number: 16845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 09:52:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 09:52:33 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 09:52:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 11:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 14 Jan 2020 11:01:51 +0000 Subject: Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 11:01:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:05:57 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:05:57 +0000 Subject: Change in osmo-asf4-dfu[master]: restrict flash and SRAM size in linker script References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849 ) Change subject: restrict flash and SRAM size in linker script ...................................................................... restrict flash and SRAM size in linker script since the bootloader should not exceed 16 kB, the linker script now limits the rom section to 16 kB. this will prevent generating larger bootloader images, which could overlap with the application starting at 16 kB. the SRAM size has also been reduce to 192 kB. this is the least amount SAME54 micro-controllers have. Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 --- M gcc/Makefile R gcc/gcc/same54_flash.ld D gcc/gcc/same54p20a_sram.ld 3 files changed, 6 insertions(+), 167 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/49/16849/1 diff --git a/gcc/Makefile b/gcc/Makefile index 3493102..ccf2af3 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -190,7 +190,7 @@ $(QUOTE)arm-none-eabi-gcc$(QUOTE) -o $(OUTPUT_FILE_NAME).elf $(OBJS_AS_ARGS) -Wl,--start-group -lm -Wl,--end-group -mthumb \ -Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ \ --T"../gcc/gcc/same54p20a_flash.ld" \ +-T"../gcc/gcc/same54_flash.ld" \ -L"../gcc/gcc" @echo Finished building target: $@ diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54_flash.ld similarity index 91% rename from gcc/gcc/same54p20a_flash.ld rename to gcc/gcc/same54_flash.ld index 6aa3fb1..f005197 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54_flash.ld @@ -1,7 +1,7 @@ /** * \file * - * \brief Linker script for running in internal FLASH on the SAME54P20A + * \brief Linker script for running in internal FLASH on SAME54 devices * * Copyright (c) 2018 Microchip Technology Inc. * @@ -35,9 +35,10 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 - /* The first word of the RAM is used for the DFU magic */ - ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00040000 - 4 + /* Limit flash for bootloader to first 16 kB */ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 16K + /* Least amount of SRAM for SAME54 micro-controller is 182 kB. The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 192K - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/gcc/gcc/same54p20a_sram.ld b/gcc/gcc/same54p20a_sram.ld deleted file mode 100644 index b3be5b3..0000000 --- a/gcc/gcc/same54p20a_sram.ld +++ /dev/null @@ -1,162 +0,0 @@ -/** - * \file - * - * \brief Linker script for running in internal SRAM on the SAME54P20A - * - * Copyright (c) 2018 Microchip Technology Inc. - * - * \asf_license_start - * - * \page License - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the Licence at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * \asf_license_stop - * - */ - - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -SEARCH_DIR(.) - -/* Memory Spaces Definitions */ -MEMORY -{ - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 -} - -/* The stack size used by the application. NOTE: you need to adjust according to your application. */ -STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000; - -/* Section Definitions */ -SECTIONS -{ - .text : - { - . = ALIGN(4); - _sfixed = .; - KEEP(*(.vectors .vectors.*)) - *(.text .text.* .gnu.linkonce.t.*) - *(.glue_7t) *(.glue_7) - *(.rodata .rodata* .gnu.linkonce.r.*) - *(.ARM.extab* .gnu.linkonce.armextab.*) - - /* Support C constructors, and C destructors in both user code - and the C library. This also provides support for C++ code. */ - . = ALIGN(4); - KEEP(*(.init)) - . = ALIGN(4); - __preinit_array_start = .; - KEEP (*(.preinit_array)) - __preinit_array_end = .; - - . = ALIGN(4); - __init_array_start = .; - KEEP (*(SORT(.init_array.*))) - KEEP (*(.init_array)) - __init_array_end = .; - - . = ALIGN(4); - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*crtend.o(.ctors)) - - . = ALIGN(4); - KEEP(*(.fini)) - - . = ALIGN(4); - __fini_array_start = .; - KEEP (*(.fini_array)) - KEEP (*(SORT(.fini_array.*))) - __fini_array_end = .; - - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*crtend.o(.dtors)) - - . = ALIGN(4); - _efixed = .; /* End of text section */ - } > ram - - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : - { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > ram - PROVIDE_HIDDEN (__exidx_end = .); - - . = ALIGN(4); - _etext = .; - - .relocate : AT (_etext) - { - . = ALIGN(4); - _srelocate = .; - *(.ramfunc .ramfunc.*); - *(.data .data.*); - . = ALIGN(4); - _erelocate = .; - } > ram - - .bkupram (NOLOAD): - { - . = ALIGN(8); - _sbkupram = .; - *(.bkupram .bkupram.*); - . = ALIGN(8); - _ebkupram = .; - } > bkupram - - .qspi (NOLOAD): - { - . = ALIGN(8); - _sqspi = .; - *(.qspi .qspi.*); - . = ALIGN(8); - _eqspi = .; - } > qspi - - /* .bss section which is used for uninitialized data */ - .bss (NOLOAD) : - { - . = ALIGN(4); - _sbss = . ; - _szero = .; - *(.bss .bss.*) - *(COMMON) - . = ALIGN(4); - _ebss = . ; - _ezero = .; - } > ram - - /* stack section */ - .stack (NOLOAD): - { - . = ALIGN(8); - _sstack = .; - . = . + STACK_SIZE; - . = ALIGN(8); - _estack = .; - } > ram - - . = ALIGN(4); - _end = . ; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 Gerrit-Change-Number: 16849 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:55 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:55 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: fix USB transfer References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16850 ) Change subject: fix USB transfer ...................................................................... fix USB transfer this ASFv4 USB library change fixes USB transfer. two transfer-size issues existed: - on multi-packet transfer if the last packet was less than the USB transfer packet size, the packet would be received but not acknowledged - during normal transfer the packet size of a previous packet set the size of the current packet, ignoring the actual transfer size transfer with a combination of partial or full USB single packet, USB multi-packet, max transfer, and control endpoint sizes was successfully tested (in bytes): 4, 32, 64, 128, 129, 512, 516, 544, 576, 640, 641, 1024, 1028 Change-Id: Ic4e64168e865362e12e0b76386f964895b8b6c20 --- M hpl/usb/hpl_usb.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/50/16850/1 diff --git a/hpl/usb/hpl_usb.c b/hpl/usb/hpl_usb.c index 6bf09ab..cc6cc41 100644 --- a/hpl/usb/hpl_usb.c +++ b/hpl/usb/hpl_usb.c @@ -1135,6 +1135,7 @@ /* Short packet. */ ept->flags.bits.need_zlp = 0; ept->trans_count += last_trans; + _usbd_ep_set_out_trans(epn, 0, ept->size, 0); } else { /* Full packets. */ ept->trans_count += trans_size; @@ -1154,9 +1155,6 @@ if (trans_next > ept->size) { if (trans_next > USB_D_DEV_TRANS_MAX) { trans_next = USB_D_DEV_TRANS_MAX; - } else { - /* Must expect multiple of ep size. */ - trans_next -= trans_next & size_mask; } } else if (trans_next < ept->size) { /* Last un-aligned packet should be cached. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ic4e64168e865362e12e0b76386f964895b8b6c20 Gerrit-Change-Number: 16850 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:56 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:56 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: add specific board support, including sysmoOCTSIM References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16851 ) Change subject: add specific board support, including sysmoOCTSIM ...................................................................... add specific board support, including sysmoOCTSIM the board specific definitions should be coded when particular environment variable/marco is defined. this macro name is provided by the makefile in the BOARD variable. this allows to compile the bootloader for specific devices. see README for more information. the board definition for the sysmoOCTSIM is also added. Change-Id: Ie51a3af7c77ba76ac40570b871f31fd527fb255b --- M README.md M atmel_start_pins.h M config/usbd_config.h M driver_init.c M driver_init.h M gcc/Makefile M usb_dfu_main.c M usb_start.c 8 files changed, 109 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/51/16851/1 diff --git a/README.md b/README.md index 031bc27..58833aa 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,22 @@ This is an implementation of the DFU mode of the [USB DFU Device Class Specification](https://usb.org/document-library/device-firmware-upgrade-11-new-version-31-aug-2004) for the Microchip SAM D5x/E5x micro-controller. It is meant to be used as bootloader to allow flashing the main application over USB. -The code has been developed for the Microchip [SAM E54 Xplained Pro](https://www.microchip.com/DevelopmentTools/ProductDetails/PartNo/ATSAME54-XPRO) development board using a [SAM E54](https://www.microchip.com/wwwproducts/en/ATSAME54P20A) micro-controller. +The code has been developed using a [SAM E54](https://www.microchip.com/wwwproducts/en/ATSAME54P20A) micro-controller. It should work on any chip of the SAM D5x/E5x device family by replacing the corresponding device-specific definitions (usually including the chip name in the file name). The code uses the [Atmel START](https://start.atmel.com/) ASFv4 library. +Board +===== + +The code can be compiled for specific boards: + +- Microchip [SAM E54 Xplained Pro](https://www.microchip.com/DevelopmentTools/ProductDetails/PartNo/ATSAME54-XPRO) development board, named *SAME54_XPLAINED_PRO* +- sysmocom sysmoOCTSIM, name *SYSMOOCTSIM* + +The board name can be set in 'gcc/Makefile' *BOARD* variable, or provided while compiling (e.g. `make BOARD=SAME54_XPLAINED_PRO`). +*SAME54_XPLAINED_PRO* is the default value. + USB DFU ======= @@ -26,13 +37,14 @@ make ``` +The board name can be set in 'gcc/Makefile' *BOARD* variable, or provided while compiling (e.g. `make BOARD=SAME54_XPLAINED_PRO`). +*SAME54_XPLAINED_PRO* is the default value. + The resulting firmware binary is `AtmelStart.bin`. Flashing ======== -To flash the bootloader you can either use the [edbg tool](https://github.com/ataradov/edbg) over the EDBG interface of the SAM E54 Xplained Pro development board, or OpenICD with any SWJ adapter. - The USB DFU bootloader should be flashed in a protected area of the flash memory to prevent for erasing it, as specified in data sheet section 25.6.2 Memory Organization. The bootloader size is configured in the NVM user configuration BOOTPROT field, as specified in data sheet section 25.6.9 NVM User Configuration. The bit position of the BOOTPROT field is documented in data sheet section 9.4 NVM User Page Mapping. @@ -43,8 +55,26 @@ EDBG ---- +To flash the bootloader using the [edbg tool](https://github.com/ataradov/edbg) over the EDBG interface of the SAM E54 Xplained Pro development board. + To flash the USB DFU bootloader, perform the following actions: * remove reserved bootloader space so we can erase it: `edbg --target atmel_cm4v2 --fuse wv,29:26,15` * erase the whole flash: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --erase` * program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file AtmelStart.bin` * reserve bootloader space: `edbg --target atmel_cm4v2 --fuse wv,29:26,13` + +SWJ +--- + +The bootloader can also be flashed over SWJ (e.g. JTAG or SWD). +You need to perform the following actions: + +* remove reserved bootloader space so we can erase it (and reset MCU for change to be effective) +* erase the whole flash +* program the bootloader +* reserve bootloader space + +Using OpenOCD (with the [SAM E54 patch](http://openocd.zylin.com/#/c/4272/)) and a ST-LINK/V2 SWD adapter, run the following command: + +`openocd --file interface/stlink.cfg --command "transport select hla_swd" --command "set CHIPNAME same54" --command "set CPUTAPID 0x2ba01477" --file target/atsame5x.cfg --command "init" --command "reset halt" --command "atsame5 bootloader 0" --command "flash erase_sector 0 0 last" --command "reset halt" --command "program ./AtmelStart.bin" --command "atsame5 bootloader 16384" --command "reset run" --command "shutdown"` + diff --git a/atmel_start_pins.h b/atmel_start_pins.h index 86e1dfb..220a7b5 100644 --- a/atmel_start_pins.h +++ b/atmel_start_pins.h @@ -27,11 +27,19 @@ #define GPIO_PIN_FUNCTION_M 12 #define GPIO_PIN_FUNCTION_N 13 -/** LED pin to indicate system state (pull low to switch on) */ +/** LED pin to indicate system state */ +#if defined(SAME54_XPLAINED_PRO) #define LED_SYSTEM GPIO(GPIO_PORTC, 18) +#elif defined(SYSMOOCTSIM) +#define LED_SYSTEM GPIO(GPIO_PORTC, 26) +#endif -/** User button to force DFu bootloader (connected to ground when pressed) */ +/** User button to force DFU bootloader (connected to ground when pressed) */ +#if defined(SAME54_XPLAINED_PRO) #define BUTTON_FORCE_DFU GPIO(GPIO_PORTB, 31) +#elif defined(SYSMOOCTSIM) +#define BUTTON_FORCE_DFU GPIO(GPIO_PORTC, 14) +#endif /** USB D+/D- pins */ #define PA24 GPIO(GPIO_PORTA, 24) diff --git a/config/usbd_config.h b/config/usbd_config.h index c20dfb2..6133596 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -85,8 +85,12 @@ // <0x6140=> osmo-ASF4-DFU // usb_dfud_idproduct #ifndef CONF_USB_OSMOASF4DFU_IDPRODUCT +#if defined(SYSMOOCTSIM) +#define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6141 +#else #define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6140 #endif +#endif // bcdDevice <0x0000-0xFFFF> // usb_dfud_bcddevice @@ -107,12 +111,20 @@ // Unicode string of iManufact // usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR +#if defined(SYSMOOCTSIM) +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#else #define CONF_USB_DFUD_IMANUFACT_STR "osmocom" #endif +#endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC +#if defined(SYSMOOCTSIM) +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#else #define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif +#endif // @@ -130,12 +142,20 @@ // Unicode string of iProduct // usb_dfud_iproduct_str #ifndef CONF_USB_DFUD_IPRODUCT_STR +#if defined(SYSMOOCTSIM) +#define CONF_USB_DFUD_IPRODUCT_STR "sysmoOCTSIM (osmo-ASF4-DFU)" +#else #define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU" #endif +#endif #ifndef CONF_USB_DFUD_IPRODUCT_STR_DESC +#if defined(SYSMOOCTSIM) +#define CONF_USB_DFUD_IPRODUCT_STR_DESC 56, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', 0x00, 'M', 0x00, ' ', 0x00, '(', 0x00, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, '-', 0x00, 'A', 0x00, 'S', 0x00, 'F', 0x00, '4', 0x00, '-', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, ')', 0x00, +#else #define CONF_USB_DFUD_IPRODUCT_STR_DESC 28, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, '-', 0x00, 'A', 0x00, 'S', 0x00, 'F', 0x00, '4', 0x00, '-', 0x00, 'D', 0x00, 'F', 0x00, 'U', 0x00, #endif +#endif // diff --git a/driver_init.c b/driver_init.c index a91b0eb..d873230 100644 --- a/driver_init.c +++ b/driver_init.c @@ -139,18 +139,38 @@ flash_init(&FLASH_0, NVMCTRL); } +void LED_SYSTEM_on(void) +{ +#if defined(SYSMOOCTSIM) + gpio_set_pin_level(LED_SYSTEM, true); +#else + gpio_set_pin_level(LED_SYSTEM, false); +#endif +} + +void LED_SYSTEM_off(void) +{ +#if defined(SYSMOOCTSIM) + gpio_set_pin_level(LED_SYSTEM, false); +#else + gpio_set_pin_level(LED_SYSTEM, true); +#endif +} + void system_init(void) { init_mcu(); // configure system LED - gpio_set_pin_level(LED_SYSTEM, true); // switch off LED + LED_SYSTEM_off(); gpio_set_pin_direction(LED_SYSTEM, GPIO_DIRECTION_OUT); gpio_set_pin_function(LED_SYSTEM, GPIO_PIN_FUNCTION_OFF); // configure force DFU user button gpio_set_pin_direction(BUTTON_FORCE_DFU, GPIO_DIRECTION_IN); - gpio_set_pin_pull_mode(BUTTON_FORCE_DFU, GPIO_PULL_UP); +#if !defined(SYSMOOCTSIM) + gpio_set_pin_pull_mode(BUTTON_FORCE_DFU, GPIO_PULL_UP); // use internal pull-up resistor +#endif gpio_set_pin_function(BUTTON_FORCE_DFU, GPIO_PIN_FUNCTION_OFF); USB_DEVICE_INSTANCE_init(); diff --git a/driver_init.h b/driver_init.h index 0d440d4..8d8a30b 100644 --- a/driver_init.h +++ b/driver_init.h @@ -34,6 +34,15 @@ void FLASH_0_CLOCK_init(void); /** + * \brief Switch system LED on + */ +void LED_SYSTEM_on(void); +/** + * \brief Switch system LED off + */ +void LED_SYSTEM_off(void); + +/** * \brief Perform system initialization, initialize pins and clocks for * peripherals */ diff --git a/gcc/Makefile b/gcc/Makefile index 16c7858..7ad24b1 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -1,4 +1,13 @@ ################################################################################ +# User configuration. Can be edited +################################################################################ + +# Set for which board the bootloader should be compiled +# run `make clean` for the change to be effective +# possible values: SAME54_XPLAINED_PRO, SYSMOOCTSIM +BOARD ?= SAME54_XPLAINED_PRO + +################################################################################ # Automatically-generated file. Do not edit! ################################################################################ @@ -202,7 +211,7 @@ @echo Building file: $< @echo ARM/GNU C Compiler $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ --D__SAME54P20A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ +-D__SAME54P20A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -211,7 +220,7 @@ @echo Building file: $< @echo ARM/GNU Assembler $(QUOTE)arm-none-eabi-as$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ --D__SAME54P20A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ +-D__SAME54P20A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< @@ -220,7 +229,7 @@ @echo Building file: $< @echo ARM/GNU Preprocessing Assembler $(QUOTE)arm-none-eabi-gcc$(QUOTE) -x c -mthumb -DDEBUG -Os -ffunction-sections -mlong-calls -g3 -Wall -c -std=gnu99 \ --D__SAME54P20A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ +-D__SAME54P20A__ -D$(BOARD) -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 \ -I"../" -I"../config" -I"../hal/include" -I"../hal/utils/include" -I"../hpl/cmcc" -I"../hpl/core" -I"../hpl/dmac" -I"../hpl/gclk" -I"../hpl/mclk" -I"../hpl/nvmctrl" -I"../hpl/osc32kctrl" -I"../hpl/oscctrl" -I"../hpl/pm" -I"../hpl/port" -I"../hpl/ramecc" -I"../hpl/usb" -I"../hri" -I"../" -I"../config" -I"../usb" -I"../usb/class/dfu" -I"../usb/class/dfu/device" -I"../usb/device" -I"../" -I"../CMSIS/Include" -I"../include" \ -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" @echo Finished building: $< diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 449b311..96032c5 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -48,7 +48,6 @@ */ static bool check_force_dfu(void) { - gpio_set_pin_pull_mode(BUTTON_FORCE_DFU, GPIO_PULL_UP); // pull button high return (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)); // signal is low when button is pressed } diff --git a/usb_start.c b/usb_start.c index ad91840..93059ad 100644 --- a/usb_start.c +++ b/usb_start.c @@ -80,7 +80,7 @@ void usb_dfu(void) { while (!dfudf_is_enabled()); // wait for DFU to be installed - gpio_set_pin_level(LED_SYSTEM, false); // switch LED on to indicate USB DFU stack is ready + LED_SYSTEM_on(); // switch LED on to indicate USB DFU stack is ready ASSERT(hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw) <= 15); uint32_t application_start_address = (15 - hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw)) * 8192; // calculate bootloader size to know where we should write the application firmware @@ -89,7 +89,7 @@ while (true) { // main DFU infinite loop // run the second part of the USB DFU state machine handling non-USB aspects if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state || USB_DFU_STATE_DFU_DNBUSY == dfu_state) { // there is some data to be flashed - gpio_set_pin_level(LED_SYSTEM, true); // switch LED off to indicate we are flashing + LED_SYSTEM_off(); // switch LED off to indicate we are flashing if (dfu_download_length > 0) { // there is some data to be flashed int32_t rc = flash_write(&FLASH_0, application_start_address + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash if (ERR_NONE == rc) { @@ -108,7 +108,7 @@ // this case should not happen, but it's not a critical error dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing can continue } - gpio_set_pin_level(LED_SYSTEM, false); // switch LED on to indicate USB DFU can resume + LED_SYSTEM_on(); // switch LED on to indicate USB DFU can resume } if (USB_DFU_STATE_DFU_MANIFEST == dfu_state) { // we can start manifestation (finish flashing) // in theory every DFU files should have a suffix to with a CRC to check the data -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ie51a3af7c77ba76ac40570b871f31fd527fb255b Gerrit-Change-Number: 16851 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:56 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:56 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: minor: rename output binary to bootloader References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16852 ) Change subject: minor: rename output binary to bootloader ...................................................................... minor: rename output binary to bootloader Change-Id: I4dfa761c482d6d061eddf3ff8ee91ec049955f53 --- M README.md M gcc/Makefile 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/52/16852/1 diff --git a/README.md b/README.md index 58833aa..96cf583 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ The board name can be set in 'gcc/Makefile' *BOARD* variable, or provided while compiling (e.g. `make BOARD=SAME54_XPLAINED_PRO`). *SAME54_XPLAINED_PRO* is the default value. -The resulting firmware binary is `AtmelStart.bin`. +The resulting firmware binary is `bootloader.bin`. Flashing ======== @@ -60,7 +60,7 @@ To flash the USB DFU bootloader, perform the following actions: * remove reserved bootloader space so we can erase it: `edbg --target atmel_cm4v2 --fuse wv,29:26,15` * erase the whole flash: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --erase` -* program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file AtmelStart.bin` +* program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file bootloader.bin` * reserve bootloader space: `edbg --target atmel_cm4v2 --fuse wv,29:26,13` SWJ @@ -76,5 +76,5 @@ Using OpenOCD (with the [SAM E54 patch](http://openocd.zylin.com/#/c/4272/)) and a ST-LINK/V2 SWD adapter, run the following command: -`openocd --file interface/stlink.cfg --command "transport select hla_swd" --command "set CHIPNAME same54" --command "set CPUTAPID 0x2ba01477" --file target/atsame5x.cfg --command "init" --command "reset halt" --command "atsame5 bootloader 0" --command "flash erase_sector 0 0 last" --command "reset halt" --command "program ./AtmelStart.bin" --command "atsame5 bootloader 16384" --command "reset run" --command "shutdown"` +`openocd --file interface/stlink.cfg --command "transport select hla_swd" --command "set CHIPNAME same54" --command "set CPUTAPID 0x2ba01477" --file target/atsame5x.cfg --command "init" --command "reset halt" --command "atsame5 bootloader 0" --command "flash erase_sector 0 0 last" --command "reset halt" --command "program ./bootloader.bin" --command "atsame5 bootloader 16384" --command "reset run" --command "shutdown"` diff --git a/gcc/Makefile b/gcc/Makefile index 7ad24b1..0817806 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -167,7 +167,7 @@ "gcc/system_same54.d" \ "atmel_start.d" -OUTPUT_FILE_NAME :=AtmelStart +OUTPUT_FILE_NAME := bootloader QUOTE := " OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I4dfa761c482d6d061eddf3ff8ee91ec049955f53 Gerrit-Change-Number: 16852 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:56 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:56 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: add force DFU using magic value References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16853 ) Change subject: add force DFU using magic value ...................................................................... add force DFU using magic value if the string "DFU!" is found at the beginning of the RAM (e.g. as written by the main application during USB detach), the DFU bootloader will be started. Change-Id: I298e3697c06d352a6e0f47266097844c490e1722 --- M README.md M gcc/gcc/same54p20a_flash.ld M usb_dfu_main.c 3 files changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/53/16853/1 diff --git a/README.md b/README.md index 96cf583..dd61824 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,16 @@ Set the corresponding attributes in the 'DFUD_IFACE_DESCB' macro definition in the 'usb/class/dfu/device/dfudf_desc.h' file. +To force the DFU bootloader to start there are several possibilities: + +* if the application following the bootloader is invalid (e.g. MSP is not in RAM) +* if a button is pressed (the button defined in *BUTTON_FORCE_DFU*) +* if the magic value "DFU!" (e.g. 0x44465521) is set at the start of the RAM (e.g. by the main application when performing a USB detach) + Compiling ========= -Use the 'Makefile' script to compile the source code using the ARM none EABI GCC cross-cimpilig toolchain: +Use the 'Makefile' script to compile the source code using the ARM none EABI GCC cross-compiling toolchain: ``` cd gcc make diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index 08099d2..32ded77 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -36,7 +36,8 @@ MEMORY { rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00040000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } @@ -47,6 +48,12 @@ /* Section Definitions */ SECTIONS { + /* Location of the DFU magic. The application must set the magic value "DFU!" (e.g. 0x44465521) at this address to force the DFU bootloader to start (e.g. to perform a DFU detach) */ + .dfu_magic 0x20000000 : + { + KEEP(*(.dfu_magic)) ; + } + .text : { . = ALIGN(4); diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 96032c5..81b02f8 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -27,6 +27,9 @@ */ static uint32_t* application_start_address; +/** Location of the DFU magic value to force starting DFU */ +static uint32_t dfu_magic __attribute__ ((section (".dfu_magic"))) __attribute__ ((__used__)); + /** Check if the bootloader is valid * \return true if the bootloader is valid and can be run * \remark initializes application_start_address @@ -48,7 +51,14 @@ */ static bool check_force_dfu(void) { - return (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)); // signal is low when button is pressed + if (0x44465521 == dfu_magic) { // check for the magic value which can be set by the main application + dfu_magic = 0; // erase value so we don't stay in the DFU bootloader upon reset + return true; + } + if (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)) { // signal is low when button is pressed + return true; + } + return false; } /** Check if the application is valid -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I298e3697c06d352a6e0f47266097844c490e1722 Gerrit-Change-Number: 16853 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:56 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:56 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: set initial DFU state to ERROR if application is corrupt References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16854 ) Change subject: set initial DFU state to ERROR if application is corrupt ...................................................................... set initial DFU state to ERROR if application is corrupt as specified in DFU standard Change-Id: Icd503a2d19f829eb43a83c28b526b73d595640f0 --- M usb/class/dfu/device/dfudf.c M usb_dfu_main.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/54/16854/1 diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c index 8232979..223999a 100644 --- a/usb/class/dfu/device/dfudf.c +++ b/usb/class/dfu/device/dfudf.c @@ -306,7 +306,6 @@ usbdc_register_function(&_dfudf); usbdc_register_handler(USBDC_HDL_REQ, &dfudf_req_h); - // TODO check if firmware is corrupted and set dfuERROR state if it is return ERR_NONE; } diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 81b02f8..7fd54d3 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -101,6 +101,9 @@ if (!check_force_dfu() && check_application()) { // application is valid start_application(); // start application } else { + if (!check_application()) { // if the application is corrupted the start DFU start should be dfuERROR + dfu_state = USB_DFU_STATE_DFU_ERROR; + } usb_dfu(); // start DFU bootloader } } -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Icd503a2d19f829eb43a83c28b526b73d595640f0 Gerrit-Change-Number: 16854 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:57 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:57 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: fix DFU magic address and linker script References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16855 ) Change subject: fix DFU magic address and linker script ...................................................................... fix DFU magic address and linker script using the address specified in the linker script leads to a large output binary (as large as the address specified. instead the address is now specified in the source file. Change-Id: I69ad101593e903b74084f179cfc97fccccdfa5a3 --- M gcc/gcc/same54p20a_flash.ld M usb_dfu_main.c 2 files changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/55/16855/1 diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54p20a_flash.ld index 32ded77..6aa3fb1 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54p20a_flash.ld @@ -48,12 +48,6 @@ /* Section Definitions */ SECTIONS { - /* Location of the DFU magic. The application must set the magic value "DFU!" (e.g. 0x44465521) at this address to force the DFU bootloader to start (e.g. to perform a DFU detach) */ - .dfu_magic 0x20000000 : - { - KEEP(*(.dfu_magic)) ; - } - .text : { . = ALIGN(4); diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 7fd54d3..f431d29 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -28,7 +28,7 @@ static uint32_t* application_start_address; /** Location of the DFU magic value to force starting DFU */ -static uint32_t dfu_magic __attribute__ ((section (".dfu_magic"))) __attribute__ ((__used__)); +static volatile uint32_t* dfu_magic = (uint32_t*)HSRAM_ADDR; // magic value should be written at start of RAM /** Check if the bootloader is valid * \return true if the bootloader is valid and can be run @@ -51,8 +51,8 @@ */ static bool check_force_dfu(void) { - if (0x44465521 == dfu_magic) { // check for the magic value which can be set by the main application - dfu_magic = 0; // erase value so we don't stay in the DFU bootloader upon reset + if (0x44465521 == *dfu_magic) { // check for the magic value which can be set by the main application + *dfu_magic = 0; // erase value so we don't stay in the DFU bootloader upon reset return true; } if (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)) { // signal is low when button is pressed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I69ad101593e903b74084f179cfc97fccccdfa5a3 Gerrit-Change-Number: 16855 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:57 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:57 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: minox: use RAM address define instead of hardcoded value References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16856 ) Change subject: minox: use RAM address define instead of hardcoded value ...................................................................... minox: use RAM address define instead of hardcoded value Change-Id: I81a42637194cbf0b5152fe38c691522021ab7582 --- M usb_dfu_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/56/16856/1 diff --git a/usb_dfu_main.c b/usb_dfu_main.c index f431d29..19fe437 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -73,7 +73,7 @@ * if the SP is not in this range (e.g. flash has been erased) there is no valid application * the second entry in the vector table is the reset address, corresponding to the application start */ - return (0x20000000 == ((*application_start_address) & 0xFFF80000)); + return (HSRAM_ADDR == ((*application_start_address) & 0xFFF80000)); } /** Start the application -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I81a42637194cbf0b5152fe38c691522021ab7582 Gerrit-Change-Number: 16856 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:57 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:57 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: name binaries including their git version number References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16857 ) Change subject: name binaries including their git version number ...................................................................... name binaries including their git version number Change-Id: I90fb8e6effd05c3e472492aced7c07a2ce837e5e Related: OS#3452 --- M gcc/Makefile A git-version-gen 2 files changed, 154 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/57/16857/1 diff --git a/gcc/Makefile b/gcc/Makefile index 0817806..41779c3 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -7,6 +7,8 @@ # possible values: SAME54_XPLAINED_PRO, SYSMOOCTSIM BOARD ?= SAME54_XPLAINED_PRO +GIT_VERSION=$(shell ../git-version-gen $(TOP)/.tarvers) + ################################################################################ # Automatically-generated file. Do not edit! ################################################################################ @@ -167,7 +169,7 @@ "gcc/system_same54.d" \ "atmel_start.d" -OUTPUT_FILE_NAME := bootloader +OUTPUT_FILE_NAME := bootloader-$(GIT_VERSION) QUOTE := " OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I90fb8e6effd05c3e472492aced7c07a2ce837e5e Gerrit-Change-Number: 16857 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:58 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:58 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: include board (target) in filename, files are now called like References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16858 to review the following change. Change subject: include board (target) in filename, files are now called like ...................................................................... include board (target) in filename, files are now called like bootloader-sysmooctsim-0.1.1-5554-dirty.elf Change-Id: Ibdde1c02d5dd3bcd714bae1d374397d9596fede0 --- M README.md M gcc/Makefile 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/58/16858/1 diff --git a/README.md b/README.md index dd61824..e63565e 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The board name can be set in 'gcc/Makefile' *BOARD* variable, or provided while compiling (e.g. `make BOARD=SAME54_XPLAINED_PRO`). *SAME54_XPLAINED_PRO* is the default value. -The resulting firmware binary is `bootloader.bin`. +The resulting firmware binary is `bootloader-$(BOARD)-$(GIT_VERSION).bin`. Flashing ======== @@ -66,7 +66,7 @@ To flash the USB DFU bootloader, perform the following actions: * remove reserved bootloader space so we can erase it: `edbg --target atmel_cm4v2 --fuse wv,29:26,15` * erase the whole flash: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --erase` -* program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file bootloader.bin` +* program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file bootloader-BOARD-XXXX.bin` * reserve bootloader space: `edbg --target atmel_cm4v2 --fuse wv,29:26,13` SWJ diff --git a/gcc/Makefile b/gcc/Makefile index 41779c3..86d199c 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -169,7 +169,8 @@ "gcc/system_same54.d" \ "atmel_start.d" -OUTPUT_FILE_NAME := bootloader-$(GIT_VERSION) +BOARD_LC := $(shell echo $(BOARD) | tr A-Z a-z) +OUTPUT_FILE_NAME := bootloader-$(BOARD_LC)-$(GIT_VERSION) QUOTE := " OUTPUT_FILE_PATH +=$(OUTPUT_FILE_NAME).elf OUTPUT_FILE_PATH_AS_ARGS +=$(OUTPUT_FILE_NAME).elf -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ibdde1c02d5dd3bcd714bae1d374397d9596fede0 Gerrit-Change-Number: 16858 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:14:59 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:14:59 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: create bootloader-$(BOARD).{elf, bin} symlinks References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16859 to review the following change. Change subject: create bootloader-$(BOARD).{elf,bin} symlinks ...................................................................... create bootloader-$(BOARD).{elf,bin} symlinks Change-Id: I3a1eb038e51f4b38ae2e2154bd53c615d98db517 --- M gcc/Makefile 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/59/16859/1 diff --git a/gcc/Makefile b/gcc/Makefile index 86d199c..06404ad 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -180,7 +180,7 @@ vpath %.S ../ # All Target -all: $(SUB_DIRS) $(OUTPUT_FILE_PATH) +all: $(SUB_DIRS) $(OUTPUT_FILE_PATH) symlink # Linker target @@ -203,7 +203,10 @@ "arm-none-eabi-objdump" -h -S "$(OUTPUT_FILE_NAME).elf" > "$(OUTPUT_FILE_NAME).lss" "arm-none-eabi-size" "$(OUTPUT_FILE_NAME).elf" - +.PHONY: symlink +symlink: $(OUTPUT_FILE_PATH) + ln -sf $(OUTPUT_FILE_NAME).bin bootloader-$(BOARD_LC).bin + ln -sf $(OUTPUT_FILE_NAME).elf bootloader-$(BOARD_LC).elf # Compiler targets @@ -253,4 +256,4 @@ rm -f $(DEPS_AS_ARGS) rm -f $(OUTPUT_FILE_NAME).a $(OUTPUT_FILE_NAME).hex $(OUTPUT_FILE_NAME).bin \ $(OUTPUT_FILE_NAME).lss $(OUTPUT_FILE_NAME).eep $(OUTPUT_FILE_NAME).map \ - $(OUTPUT_FILE_NAME).srec + $(OUTPUT_FILE_NAME).srec bootloader-$(BOARD_LC).bin bootloader-$(BOARD_LC).elf -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I3a1eb038e51f4b38ae2e2154bd53c615d98db517 Gerrit-Change-Number: 16859 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:00 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:00 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: jenkins.sh: Add --publish to publish binaries, similar to simtrace2.git References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16860 to review the following change. Change subject: jenkins.sh: Add --publish to publish binaries, similar to simtrace2.git ...................................................................... jenkins.sh: Add --publish to publish binaries, similar to simtrace2.git Binaries will be on https://ftp.osmocom.org/binaries/osmo-asf4-dfu/ Change-Id: Idc27a3d7d2bd7cbee1061ce778ace280eff17bf4 --- M contrib/jenkins.sh M gcc/Makefile 2 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/60/16860/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0965bf5..24bfdc1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/bin/sh +if ! [ -x "$(command -v osmo-deps.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi + set -ex if [ -z "$MAKE" ]; then @@ -8,10 +13,37 @@ exit 1 fi +TOPDIR=`pwd` + +publish="$1" + osmo-clean-workspace.sh verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") -cd gcc && $MAKE $PARALLEL_MAKE +cd gcc +$MAKE mrproper +$MAKE $PARALLEL_MAKE +$MAKE $PARALLEL_MAKE BOARD=SYSMOOCTSIM + +if [ "x$publish" = "x--publish" ]; then + echo + echo "=============== UPLOAD BUILD ==============" + + cat > "/build/known_hosts" < Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:00 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:00 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: contrib/jenkins.sh: move to /bin/bash References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16861 to review the following change. Change subject: contrib/jenkins.sh: move to /bin/bash ...................................................................... contrib/jenkins.sh: move to /bin/bash We need this in order to support constructs like foobar.{bin,elf} to expand properly. Change-Id: I3d12795da7ab29d1bd0f7371c3365c54c79ae09a --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/61/16861/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 24bfdc1..a3700eb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if ! [ -x "$(command -v osmo-deps.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I3d12795da7ab29d1bd0f7371c3365c54c79ae09a Gerrit-Change-Number: 16861 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:01 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:01 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: jenkins.sh: Introduce 'make clean' between different board builds References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16862 to review the following change. Change subject: jenkins.sh: Introduce 'make clean' between different board builds ...................................................................... jenkins.sh: Introduce 'make clean' between different board builds Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/62/16862/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a3700eb..2471deb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -23,7 +23,10 @@ cd gcc $MAKE mrproper +# build for EVK $MAKE $PARALLEL_MAKE +$MAKE clean +# build for sysmoOCTSIM $MAKE $PARALLEL_MAKE BOARD=SYSMOOCTSIM if [ "x$publish" = "x--publish" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd Gerrit-Change-Number: 16862 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:01 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:01 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: update iManufacturer strings (full sysmocom company name, ...) References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16863 to review the following change. Change subject: update iManufacturer strings (full sysmocom company name, ...) ...................................................................... update iManufacturer strings (full sysmocom company name, ...) this ensures the iManufacturer string is identical across different products. Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb --- M config/usbd_config.h 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/63/16863/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index 6133596..f82934c 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -112,17 +112,18 @@ // usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #else -#define CONF_USB_DFUD_IMANUFACT_STR "osmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "Osmocom" #endif #endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #else -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'O', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb Gerrit-Change-Number: 16863 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:02 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:02 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: restrict flash and SRAM size in linker script References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16864 ) Change subject: restrict flash and SRAM size in linker script ...................................................................... restrict flash and SRAM size in linker script since the bootloader should not exceed 16 kB, the linker script now limits the rom section to 16 kB. this will prevent generating larger bootloader images, which could overlap with the application starting at 16 kB. the SRAM size has also been reduce to 192 kB. this is the least amount SAME54 micro-controllers have. Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 --- M gcc/Makefile R gcc/gcc/same54_flash.ld D gcc/gcc/same54p20a_sram.ld 3 files changed, 6 insertions(+), 167 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/64/16864/1 diff --git a/gcc/Makefile b/gcc/Makefile index 3493102..ccf2af3 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -190,7 +190,7 @@ $(QUOTE)arm-none-eabi-gcc$(QUOTE) -o $(OUTPUT_FILE_NAME).elf $(OBJS_AS_ARGS) -Wl,--start-group -lm -Wl,--end-group -mthumb \ -Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \ \ --T"../gcc/gcc/same54p20a_flash.ld" \ +-T"../gcc/gcc/same54_flash.ld" \ -L"../gcc/gcc" @echo Finished building target: $@ diff --git a/gcc/gcc/same54p20a_flash.ld b/gcc/gcc/same54_flash.ld similarity index 91% rename from gcc/gcc/same54p20a_flash.ld rename to gcc/gcc/same54_flash.ld index 6aa3fb1..f005197 100644 --- a/gcc/gcc/same54p20a_flash.ld +++ b/gcc/gcc/same54_flash.ld @@ -1,7 +1,7 @@ /** * \file * - * \brief Linker script for running in internal FLASH on the SAME54P20A + * \brief Linker script for running in internal FLASH on SAME54 devices * * Copyright (c) 2018 Microchip Technology Inc. * @@ -35,9 +35,10 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 - /* The first word of the RAM is used for the DFU magic */ - ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00040000 - 4 + /* Limit flash for bootloader to first 16 kB */ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 16K + /* Least amount of SRAM for SAME54 micro-controller is 182 kB. The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 192K - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/gcc/gcc/same54p20a_sram.ld b/gcc/gcc/same54p20a_sram.ld deleted file mode 100644 index b3be5b3..0000000 --- a/gcc/gcc/same54p20a_sram.ld +++ /dev/null @@ -1,162 +0,0 @@ -/** - * \file - * - * \brief Linker script for running in internal SRAM on the SAME54P20A - * - * Copyright (c) 2018 Microchip Technology Inc. - * - * \asf_license_start - * - * \page License - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the Licence at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * \asf_license_stop - * - */ - - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -SEARCH_DIR(.) - -/* Memory Spaces Definitions */ -MEMORY -{ - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 -} - -/* The stack size used by the application. NOTE: you need to adjust according to your application. */ -STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000; - -/* Section Definitions */ -SECTIONS -{ - .text : - { - . = ALIGN(4); - _sfixed = .; - KEEP(*(.vectors .vectors.*)) - *(.text .text.* .gnu.linkonce.t.*) - *(.glue_7t) *(.glue_7) - *(.rodata .rodata* .gnu.linkonce.r.*) - *(.ARM.extab* .gnu.linkonce.armextab.*) - - /* Support C constructors, and C destructors in both user code - and the C library. This also provides support for C++ code. */ - . = ALIGN(4); - KEEP(*(.init)) - . = ALIGN(4); - __preinit_array_start = .; - KEEP (*(.preinit_array)) - __preinit_array_end = .; - - . = ALIGN(4); - __init_array_start = .; - KEEP (*(SORT(.init_array.*))) - KEEP (*(.init_array)) - __init_array_end = .; - - . = ALIGN(4); - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*crtend.o(.ctors)) - - . = ALIGN(4); - KEEP(*(.fini)) - - . = ALIGN(4); - __fini_array_start = .; - KEEP (*(.fini_array)) - KEEP (*(SORT(.fini_array.*))) - __fini_array_end = .; - - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*crtend.o(.dtors)) - - . = ALIGN(4); - _efixed = .; /* End of text section */ - } > ram - - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : - { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > ram - PROVIDE_HIDDEN (__exidx_end = .); - - . = ALIGN(4); - _etext = .; - - .relocate : AT (_etext) - { - . = ALIGN(4); - _srelocate = .; - *(.ramfunc .ramfunc.*); - *(.data .data.*); - . = ALIGN(4); - _erelocate = .; - } > ram - - .bkupram (NOLOAD): - { - . = ALIGN(8); - _sbkupram = .; - *(.bkupram .bkupram.*); - . = ALIGN(8); - _ebkupram = .; - } > bkupram - - .qspi (NOLOAD): - { - . = ALIGN(8); - _sqspi = .; - *(.qspi .qspi.*); - . = ALIGN(8); - _eqspi = .; - } > qspi - - /* .bss section which is used for uninitialized data */ - .bss (NOLOAD) : - { - . = ALIGN(4); - _sbss = . ; - _szero = .; - *(.bss .bss.*) - *(COMMON) - . = ALIGN(4); - _ebss = . ; - _ezero = .; - } > ram - - /* stack section */ - .stack (NOLOAD): - { - . = ALIGN(8); - _sstack = .; - . = . + STACK_SIZE; - . = ALIGN(8); - _estack = .; - } > ram - - . = ALIGN(4); - _end = . ; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 Gerrit-Change-Number: 16864 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:15:02 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:15:02 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: document flashing procedure for sysmoOCTSIM References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16865 ) Change subject: document flashing procedure for sysmoOCTSIM ...................................................................... document flashing procedure for sysmoOCTSIM the sysmoOCTSIM board does not have an onboard EDBG adapter such as the SAM E54 Xplained Pro board. instead SWD is used directly. Change-Id: I75766fc891dd835afc35ece9a1eee1c495c5ab20 --- M README.md 1 file changed, 8 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/65/16865/1 diff --git a/README.md b/README.md index e63565e..5bf5e0a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ This is an implementation of the DFU mode of the [USB DFU Device Class Specification](https://usb.org/document-library/device-firmware-upgrade-11-new-version-31-aug-2004) for the Microchip SAM D5x/E5x micro-controller. It is meant to be used as bootloader to allow flashing the main application over USB. -The code has been developed using a [SAM E54](https://www.microchip.com/wwwproducts/en/ATSAME54P20A) micro-controller. -It should work on any chip of the SAM D5x/E5x device family by replacing the corresponding device-specific definitions (usually including the chip name in the file name). +This branch is specific to the proprietary sysmocom sysmoOCTSIM hardware. The code uses the [Atmel START](https://start.atmel.com/) ASFv4 library. @@ -51,6 +50,8 @@ Flashing ======== +To flash the bootloader you can use OpenOCD with any SWJ adapter. + The USB DFU bootloader should be flashed in a protected area of the flash memory to prevent for erasing it, as specified in data sheet section 25.6.2 Memory Organization. The bootloader size is configured in the NVM user configuration BOOTPROT field, as specified in data sheet section 25.6.9 NVM User Configuration. The bit position of the BOOTPROT field is documented in data sheet section 9.4 NVM User Page Mapping. @@ -58,29 +59,14 @@ This setting will also tell the bootloader where to flash the application firmware to (e.g. after the bootloader reserved space). The LED will blink once per second if this size is not set. -EDBG ----- +ST-LINK/V2 +---------- -To flash the bootloader using the [edbg tool](https://github.com/ataradov/edbg) over the EDBG interface of the SAM E54 Xplained Pro development board. - -To flash the USB DFU bootloader, perform the following actions: -* remove reserved bootloader space so we can erase it: `edbg --target atmel_cm4v2 --fuse wv,29:26,15` -* erase the whole flash: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --erase` -* program the bootloader: `edbg --target atmel_cm4v2 --fuse v,29:26,15 --program --verify --file bootloader-BOARD-XXXX.bin` -* reserve bootloader space: `edbg --target atmel_cm4v2 --fuse wv,29:26,13` - -SWJ ---- - -The bootloader can also be flashed over SWJ (e.g. JTAG or SWD). -You need to perform the following actions: - +To flash the USB DFU bootloader, we will use OpenOCD (with the [SAM E54 patch](http://openocd.zylin.com/#/c/4272/) and a ST-LINK/V2 SWD adapter. +The command will perform the following actions: * remove reserved bootloader space so we can erase it (and reset MCU for change to be effective) * erase the whole flash * program the bootloader * reserve bootloader space -Using OpenOCD (with the [SAM E54 patch](http://openocd.zylin.com/#/c/4272/)) and a ST-LINK/V2 SWD adapter, run the following command: - -`openocd --file interface/stlink.cfg --command "transport select hla_swd" --command "set CHIPNAME same54" --command "set CPUTAPID 0x2ba01477" --file target/atsame5x.cfg --command "init" --command "reset halt" --command "atsame5 bootloader 0" --command "flash erase_sector 0 0 last" --command "reset halt" --command "program ./bootloader.bin" --command "atsame5 bootloader 16384" --command "reset run" --command "shutdown"` - +`openocd --file interface/stlink.cfg --command "transport select hla_swd" --command "set CHIPNAME same54" --command "set CPUTAPID 0x2ba01477" --file target/atsame5x.cfg --command "init" --command "reset halt" --command "atsame5 bootloader 0" --command "flash erase_sector 0 0 last" --command "reset halt" --command "program ./AtmelStart.bin" --command "atsame5 bootloader 16384" --command "reset run" --command "shutdown"` -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I75766fc891dd835afc35ece9a1eee1c495c5ab20 Gerrit-Change-Number: 16865 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:21:37 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:21:37 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: jenkins.sh: Introduce 'make clean' between different board builds In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16862 ) Change subject: jenkins.sh: Introduce 'make clean' between different board builds ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd Gerrit-Change-Number: 16862 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:36 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:36 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: name binaries including their git version number In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16857 ) Change subject: name binaries including their git version number ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I90fb8e6effd05c3e472492aced7c07a2ce837e5e Gerrit-Change-Number: 16857 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:40 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:40 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: include board (target) in filename, files are now called like In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16858 ) Change subject: include board (target) in filename, files are now called like ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ibdde1c02d5dd3bcd714bae1d374397d9596fede0 Gerrit-Change-Number: 16858 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:44 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:44 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: add specific board support, including sysmoOCTSIM In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16851 ) Change subject: add specific board support, including sysmoOCTSIM ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ie51a3af7c77ba76ac40570b871f31fd527fb255b Gerrit-Change-Number: 16851 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:48 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:48 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: minor: rename output binary to bootloader In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16852 ) Change subject: minor: rename output binary to bootloader ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I4dfa761c482d6d061eddf3ff8ee91ec049955f53 Gerrit-Change-Number: 16852 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:52 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:52 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: fix DFU magic address and linker script In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16855 ) Change subject: fix DFU magic address and linker script ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I69ad101593e903b74084f179cfc97fccccdfa5a3 Gerrit-Change-Number: 16855 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:22:56 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:22:56 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: add force DFU using magic value In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16853 ) Change subject: add force DFU using magic value ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I298e3697c06d352a6e0f47266097844c490e1722 Gerrit-Change-Number: 16853 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:00 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:00 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: document flashing procedure for sysmoOCTSIM In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16865 ) Change subject: document flashing procedure for sysmoOCTSIM ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I75766fc891dd835afc35ece9a1eee1c495c5ab20 Gerrit-Change-Number: 16865 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:03 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:03 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: minox: use RAM address define instead of hardcoded value In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16856 ) Change subject: minox: use RAM address define instead of hardcoded value ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I81a42637194cbf0b5152fe38c691522021ab7582 Gerrit-Change-Number: 16856 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:07 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:07 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: set initial DFU state to ERROR if application is corrupt In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16854 ) Change subject: set initial DFU state to ERROR if application is corrupt ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Icd503a2d19f829eb43a83c28b526b73d595640f0 Gerrit-Change-Number: 16854 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:11 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:11 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: contrib/jenkins.sh: move to /bin/bash In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16861 ) Change subject: contrib/jenkins.sh: move to /bin/bash ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I3d12795da7ab29d1bd0f7371c3365c54c79ae09a Gerrit-Change-Number: 16861 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:16 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:16 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: create bootloader-$(BOARD).{elf, bin} symlinks In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16859 ) Change subject: create bootloader-$(BOARD).{elf,bin} symlinks ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I3a1eb038e51f4b38ae2e2154bd53c615d98db517 Gerrit-Change-Number: 16859 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:20 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:20 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: update iManufacturer strings (full sysmocom company name, ...) In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16863 ) Change subject: update iManufacturer strings (full sysmocom company name, ...) ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb Gerrit-Change-Number: 16863 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:26 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:26 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: restrict flash and SRAM size in linker script In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16864 ) Change subject: restrict flash and SRAM size in linker script ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 Gerrit-Change-Number: 16864 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:29 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:29 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: jenkins.sh: Add --publish to publish binaries, similar to simtrace2.git In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16860 ) Change subject: jenkins.sh: Add --publish to publish binaries, similar to simtrace2.git ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Idc27a3d7d2bd7cbee1061ce778ace280eff17bf4 Gerrit-Change-Number: 16860 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 13:23:47 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 13:23:47 +0000 Subject: Change in osmo-asf4-dfu[sysmoOCTSIM]: fix USB transfer In-Reply-To: References: Message-ID: tsaitgaist has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16850 ) Change subject: fix USB transfer ...................................................................... Abandoned rebase failed -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: sysmoOCTSIM Gerrit-Change-Id: Ic4e64168e865362e12e0b76386f964895b8b6c20 Gerrit-Change-Number: 16850 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:13:50 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 14:13:50 +0000 Subject: Change in osmo-ccid-firmware[master]: reserve RAM for DFU magic References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 ) Change subject: reserve RAM for DFU magic ...................................................................... reserve RAM for DFU magic this changes the linker script so the first word (smallest unit since the data needs to be 4 baty aligned) is not reserved for the RAM section. this allows the application to write any data at this address without the rest of the code messing with the content. since the SRAM is preserved after reset, this allows to share data between firmware. in particular it allows the application to tell the bootloader it should start the flashing procedure. this is already implemented in the osmo-asf4-dfu DFU bootloader. if the application wants to switch to the DFU bootloader, write the DFU magic 0x44465521 (DFU!) at the beginning of RAM at address (uint32_t*)HSRAM_ADDR, and perform a system reset. Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e --- M sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld M sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/66/16866/1 diff --git a/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld index 7d76cc2..17fc417 100644 --- a/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld +++ b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld @@ -36,7 +36,8 @@ MEMORY { rom (rx) : ORIGIN = 0x00000000 + 16K, LENGTH = 0x00080000 - 16K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld b/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld index 33b8ed9..ce30971 100644 --- a/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld +++ b/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld @@ -36,7 +36,8 @@ MEMORY { rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e Gerrit-Change-Number: 16866 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:43:44 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:43:44 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... debian-stretch-jenkins: move from osmo-ci.git Put Dockerfile_osmocom_jenkins.amd64 ("osmocom:deb9_amd64") from osmo-ci.git here and give it a more descriptive name. Related: OS#4345 Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a --- A debian-stretch-jenkins/Dockerfile A debian-stretch-jenkins/Makefile 2 files changed, 147 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/16867/1 diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile new file mode 100644 index 0000000..63b6e74 --- /dev/null +++ b/debian-stretch-jenkins/Dockerfile @@ -0,0 +1,146 @@ +ARG DEBIAN_VERSION=stretch +FROM debian:${DEBIAN_VERSION} + +# Make "$DEBIAN_VERSION" available after FROM +# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact +ARG DEBIAN_VERSION + +# Install apt dependencies (keep in alphabetic order) +RUN \ + dpkg --add-architecture i386 && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + asciidoc \ + asciidoc-dblatex \ + autoconf \ + autoconf-archive \ + automake \ + bc \ + bison \ + bzip2 \ + cmake \ + coccinelle \ + cppcheck \ + dahdi-source \ + dblatex \ + dbus \ + debhelper \ + devscripts \ + dh-autoreconf \ + dh-systemd \ + docbook5-xml \ + doxygen \ + flex \ + g++ \ + gawk \ + gcc \ + gcc-arm-none-eabi \ + git \ + git-buildpackage \ + graphviz \ + htop \ + inkscape \ + lcov \ + libaio-dev \ + libasound2-dev \ + libboost-all-dev \ + libc-ares-dev \ + libcsv-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libffi-dev \ + libfftw3-dev \ + libgmp-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + liblua5.3-dev \ + libmnl-dev \ + libncurses5-dev \ + libnewlib-arm-none-eabi \ + liboping-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + libsctp-dev \ + libsigsegv-dev \ + libsnmp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtool \ + libusb-1.0-0-dev \ + libusb-dev \ + libxml2-utils \ + libzmq3-dev \ + locales \ + lua-socket \ + make \ + mscgen \ + ofono \ + openssh-client \ + osc \ + patchelf \ + pkg-config \ + python3 \ + python3-gi \ + python3-mako \ + python3-nwdiag \ + python3-pip \ + python3-pyflakes \ + python3-setuptools \ + python3-usb \ + python3-yaml \ + rsync \ + sdcc \ + sqlite3 \ + stow \ + sudo \ + systemd \ + tcpdump \ + texinfo \ + unzip \ + wget \ + xsltproc + +# Install pip dependencies (keep in alphabetic order) +RUN pip3 install \ + git+https://github.com/podshumok/python-smpplib.git \ + git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ + pydbus \ + pysispm + +# match the outside user +RUN useradd --uid=1000 build +#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build + +RUN mkdir /build +RUN chown build:build /build + +# Install osmo-python-tests +ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit +RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh + +# Set a UTF-8 locale +RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=en_US.UTF-8 +ENV LANG en_US.UTF-8 + +# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) +ARG LIBULFIUS_VER="2.6.4" +ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}" +ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb +ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz +RUN cd /tmp/ulfius && \ + tar -xvf all.tar.gz && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \ + cd ~ && \ + rm -r /tmp/ulfius + +# osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user +RUN chown -R build:build /usr/local diff --git a/debian-stretch-jenkins/Makefile b/debian-stretch-jenkins/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-stretch-jenkins/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:43:44 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:43:44 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... debian-buster-erlang: rename user to "build" Match username of debian-stretch-jenkins, so we can use the same docker arguments for both images in gerrit-verifications.yml of osmo-ci.git. Related: OS#4345 Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd --- M debian-buster-erlang/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/16868/1 diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile index ed20b37..7d154a5 100644 --- a/debian-buster-erlang/Dockerfile +++ b/debian-buster-erlang/Dockerfile @@ -45,6 +45,6 @@ ADD $OSMOCOM_REPO/Release /tmp/Release # add a non-root user under which we will normaly execute build tests -RUN useradd -m osmocom +RUN useradd -m build WORKDIR /home/osmocom -USER osmocom +USER build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:44:05 +0000 Subject: Change in osmo-ccid-firmware[master]: reserve RAM for DFU magic In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 ) Change subject: reserve RAM for DFU magic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e Gerrit-Change-Number: 16866 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jan 2020 14:44:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:44 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:44:44 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: introduce "gerrit_url" var References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16869 ) Change subject: gerrit-verifications: introduce "gerrit_url" var ...................................................................... gerrit-verifications: introduce "gerrit_url" var Prepare for erlang repositories, which will use this variable. Related: OS#4345 Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/16869/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index ee193d6..dfc9b88 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -42,7 +42,8 @@ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: 'osmocom:deb9_amd64' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' - repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/{repos}' + gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' + repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' # in alphabetical order @@ -168,7 +169,7 @@ {docker_img} /build/contrib/jenkins.sh - osmo-python-tests: - repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' + repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - osmo-sgsn: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 Gerrit-Change-Number: 16869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:44 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:44:44 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... docker_images_require: add symlink code path Make development easier by skipping fetch, checkout and reset --hard if _docker_playground is a symlink. Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 --- M scripts/common.sh 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/16870/1 diff --git a/scripts/common.sh b/scripts/common.sh index 6d28cfc..340bac8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -117,18 +117,24 @@ docker_images_require() { local oldpwd="$PWD" - # Get docker-plaground.git - if [ -d "_docker_playground" ]; then - git -C _docker_playground fetch + if [ -L "_docker_playground" ]; then + echo "NOTE: _docker_playground is a symlink, skipping fetch, checkout, reset" + cd "_docker_playground/$1" else - git clone https://git.osmocom.org/docker-playground/ _docker_playground - fi - cd _docker_playground - git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND" - git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND" + # Get docker-plaground.git + if [ -d "_docker_playground" ]; then + git -C _docker_playground fetch + else + git clone https://git.osmocom.org/docker-playground/ _docker_playground + fi - # jenkins-common.sh expects to run from a subdir in docker-playground.git - cd "$1" + cd _docker_playground + git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND" + git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND" + + # jenkins-common.sh expects to run from a subdir in docker-playground.git + cd "$1" + fi # Subshell: run docker_images_require from jenkins-common.sh, pass all arguments (. ../jenkins-common.sh; docker_images_require "$@") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:44:45 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... docker: move to docker-playground.git Instead of building "osmocom:deb9_amd64" from this repository, build "$USER/debian-stretch-jenkins" from docker-playground.git (same Dockerfile). Adjust all jobs to use the new image name. Add a new "update-osmo-ci-on-slaves-dp" jenkins job, which triggers the existing "update-osmo-ci-on-slaves" job whenever docker-playground.git changes. Replace docker/rebuild_osmocom_jenkins_image.sh with scripts/osmo-ci-docker-rebuild.sh, so we can get rid of the docker dir. I thought about dropping the script completely, and directly writing the two lines into contrib/jenkins.sh. But I kept the extra script for convenience, when testing locally. Related: OS#4345 Depends: docker-playground I125ae8a6bcabbd1f485028c79b0abacda0622c3a Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f --- M contrib/jenkins.sh D docker/Dockerfile_osmocom_jenkins.amd64 D docker/rebuild_osmocom_jenkins_image.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmo-gsm-tester-runner.yml M jobs/update-osmo-ci-on-slaves.yml A scripts/osmo-ci-docker-rebuild.sh 8 files changed, 33 insertions(+), 173 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/16871/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b161230..275fc69 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -11,6 +11,5 @@ git status if [ `uname` = "Linux" ]; then - cd docker - ./rebuild_osmocom_jenkins_image.sh + scripts/osmo-ci-docker-rebuild.sh fi diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 deleted file mode 100644 index 63b6e74..0000000 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ /dev/null @@ -1,146 +0,0 @@ -ARG DEBIAN_VERSION=stretch -FROM debian:${DEBIAN_VERSION} - -# Make "$DEBIAN_VERSION" available after FROM -# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact -ARG DEBIAN_VERSION - -# Install apt dependencies (keep in alphabetic order) -RUN \ - dpkg --add-architecture i386 && \ - DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - asciidoc \ - asciidoc-dblatex \ - autoconf \ - autoconf-archive \ - automake \ - bc \ - bison \ - bzip2 \ - cmake \ - coccinelle \ - cppcheck \ - dahdi-source \ - dblatex \ - dbus \ - debhelper \ - devscripts \ - dh-autoreconf \ - dh-systemd \ - docbook5-xml \ - doxygen \ - flex \ - g++ \ - gawk \ - gcc \ - gcc-arm-none-eabi \ - git \ - git-buildpackage \ - graphviz \ - htop \ - inkscape \ - lcov \ - libaio-dev \ - libasound2-dev \ - libboost-all-dev \ - libc-ares-dev \ - libcsv-dev \ - libdbd-sqlite3 \ - libdbi-dev \ - libffi-dev \ - libfftw3-dev \ - libgmp-dev \ - libgnutls28-dev \ - libgps-dev \ - libgsm1-dev \ - liblua5.3-dev \ - libmnl-dev \ - libncurses5-dev \ - libnewlib-arm-none-eabi \ - liboping-dev \ - libortp-dev \ - libpcap-dev \ - libpcsclite-dev \ - libreadline-dev \ - libsctp-dev \ - libsigsegv-dev \ - libsnmp-dev \ - libsofia-sip-ua-glib-dev \ - libsqlite3-dev \ - libssl-dev \ - libtalloc-dev \ - libtool \ - libusb-1.0-0-dev \ - libusb-dev \ - libxml2-utils \ - libzmq3-dev \ - locales \ - lua-socket \ - make \ - mscgen \ - ofono \ - openssh-client \ - osc \ - patchelf \ - pkg-config \ - python3 \ - python3-gi \ - python3-mako \ - python3-nwdiag \ - python3-pip \ - python3-pyflakes \ - python3-setuptools \ - python3-usb \ - python3-yaml \ - rsync \ - sdcc \ - sqlite3 \ - stow \ - sudo \ - systemd \ - tcpdump \ - texinfo \ - unzip \ - wget \ - xsltproc - -# Install pip dependencies (keep in alphabetic order) -RUN pip3 install \ - git+https://github.com/podshumok/python-smpplib.git \ - git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ - pydbus \ - pysispm - -# match the outside user -RUN useradd --uid=1000 build -#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build - -RUN mkdir /build -RUN chown build:build /build - -# Install osmo-python-tests -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit -RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh - -# Set a UTF-8 locale -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales && \ - update-locale LANG=en_US.UTF-8 -ENV LANG en_US.UTF-8 - -# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) -ARG LIBULFIUS_VER="2.6.4" -ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}" -ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb -ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz -RUN cd /tmp/ulfius && \ - tar -xvf all.tar.gz && \ - DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \ - cd ~ && \ - rm -r /tmp/ulfius - -# osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user -RUN chown -R build:build /usr/local diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh deleted file mode 100755 index 5d14d83..0000000 --- a/docker/rebuild_osmocom_jenkins_image.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e - -# Executes docker build with the given parameters and retry in case of error. -function build_once() { - # shellcheck disable=SC2068 - docker build $@ -f Dockerfile_osmocom_jenkins.amd64 . -} - -# Builds a container with a debian version and tag name as parameter. -function build_container() { - local tag_name=${1} - local debian_version=${2} - - echo "Pulling ${debian_version} image" - docker pull "debian:${debian_version}" - - echo "Building for ${debian_version} and setting tag ${tag_name}" - build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}" -} - -# Create containers using stretch (Debian 9.0) as base. -build_container osmocom:deb9_amd64 stretch diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index dfc9b88..0c338a6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -40,7 +40,7 @@ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ - docker_img: 'osmocom:deb9_amd64' + docker_img: '$USER/debian-stretch-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 55626ea..9b751aa 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -41,7 +41,7 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - docker_img: 'osmocom:deb9_amd64' + docker_img: 'debian-stretch-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' wrappers: [] trigger: diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index c9d84a3..d74c948 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -241,7 +241,7 @@ -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ --cap-add=sys_nice \ - osmocom:deb9_amd64 /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' + debian-stretch-jenkins /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' publishers: - archive: artifacts: '*-run.tgz, *-bin.tgz' diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 2c7309e..d47f08e 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -39,4 +39,28 @@ - email: recipients: intern at lists.sysmocom.de +# Trigger from docker-playground.git too +- job: + name: update-osmo-ci-on-slaves-dp + description: | + Trigger update-osmo-ci-on-slaves + on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves. + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + skip-tag: true + branches: + - 'origin/master' + triggers: + - pollscm: + cron: "H/5 * * * *" + ignore-post-commit-hooks: false + publishers: + - trigger: + project: "update-osmo-ci-on-slaves" + + # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh new file mode 100755 index 0000000..4a7ee25 --- /dev/null +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd "$(dirname "$0")/.." +. scripts/common.sh +docker_images_require \ + "debian-stretch-jenkins" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:44:45 +0000 Subject: Change in osmo-ci[master]: jobs/gerrit-verifications.yml: add erlang repos References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16872 ) Change subject: jobs/gerrit-verifications.yml: add erlang repos ...................................................................... jobs/gerrit-verifications.yml: add erlang repos Run contrib/jenkins.sh in erlang repositories, that were recently updated (osmo_gsup, osmo_dia2gsup, osmo_ss7). Depends: docker-playground Ia3eaec6090c9652549b2850de74ee21730374bbd Related: OS#4345 Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 --- M jobs/gerrit-verifications.yml M scripts/osmo-ci-docker-rebuild.sh 2 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/16872/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 0c338a6..8846e31 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -41,7 +41,9 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: '$USER/debian-stretch-jenkins' + docker_img_erlang: '$USER/debian-buster-erlang' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' + cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' @@ -109,6 +111,11 @@ concurrent: false cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + - osmo_dia2gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] @@ -124,6 +131,12 @@ {docker_img} /build/contrib/jenkins.sh - osmo-gsm-manuals + + - osmo_gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-hlr - osmo-iuh - osmo-mgw @@ -216,6 +229,11 @@ concurrent: false cmd: './contrib/jenkins.sh' + - ss7: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' slave_axis: !!python/tuple [ttcn3] diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 4a7ee25..943b5a0 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -2,4 +2,5 @@ cd "$(dirname "$0")/.." . scripts/common.sh docker_images_require \ - "debian-stretch-jenkins" + "debian-stretch-jenkins" \ + "debian-buster-erlang" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 Gerrit-Change-Number: 16872 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:44:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:44:48 +0000 Subject: Change in osmo-ccid-firmware[master]: reserve RAM for DFU magic In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 ) Change subject: reserve RAM for DFU magic ...................................................................... Patch Set 1: are you also planning to add the code for dfu detach here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e Gerrit-Change-Number: 16866 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jan 2020 14:44:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:45:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:45:00 +0000 Subject: Change in osmo-ccid-firmware[master]: reserve RAM for DFU magic In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 ) Change subject: reserve RAM for DFU magic ...................................................................... reserve RAM for DFU magic this changes the linker script so the first word (smallest unit since the data needs to be 4 baty aligned) is not reserved for the RAM section. this allows the application to write any data at this address without the rest of the code messing with the content. since the SRAM is preserved after reset, this allows to share data between firmware. in particular it allows the application to tell the bootloader it should start the flashing procedure. this is already implemented in the osmo-asf4-dfu DFU bootloader. if the application wants to switch to the DFU bootloader, write the DFU magic 0x44465521 (DFU!) at the beginning of RAM at address (uint32_t*)HSRAM_ADDR, and perform a system reset. Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e --- M sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld M sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld index 7d76cc2..17fc417 100644 --- a/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld +++ b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld @@ -36,7 +36,8 @@ MEMORY { rom (rx) : ORIGIN = 0x00000000 + 16K, LENGTH = 0x00080000 - 16K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } diff --git a/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld b/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld index 33b8ed9..ce30971 100644 --- a/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld +++ b/sysmoOCTSIM/gcc/gcc/same54n19a_flash.ld @@ -36,7 +36,8 @@ MEMORY { rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 + /* The first word of the RAM is used for the DFU magic */ + ram (rwx) : ORIGIN = 0x20000000 + 4, LENGTH = 0x00030000 - 4 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ibafd08429b05fd3cab6af060904201db83186a4e Gerrit-Change-Number: 16866 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:46:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:46:03 +0000 Subject: Change in osmo-asf4-dfu[master]: restrict flash and SRAM size in linker script In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849 ) Change subject: restrict flash and SRAM size in linker script ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849/1/gcc/gcc/same54_flash.ld File gcc/gcc/same54_flash.ld: https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849/1/gcc/gcc/same54_flash.ld at 40 PS1, Line 40: 182 192 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I5641adf1363346acb5f50fbaef0083508d5bfee8 Gerrit-Change-Number: 16849 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jan 2020 14:46:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:46:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:46:12 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... Patch Set 1: Why do we move it here? Are we actually moving or copying it? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:46:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:46:31 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:46:31 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves.yml: use master only In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16560 ) Change subject: jobs/update-osmo-ci-on-slaves.yml: use master only ...................................................................... Abandoned obsoleted by merged patch: https://gerrit.osmocom.org/c/osmo-ci/+/16768 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44ee3ff4477cb8313e5608b10b46ac131f51fbfc Gerrit-Change-Number: 16560 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:46:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:46:58 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile File debian-buster-erlang/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile at 49 PS1, Line 49: WORKDIR /home/osmocom I'd make sense to change WORKDIR to /home/build. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:46:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:47:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:47:31 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/16867/1/debian-stretch-jenkins/Dockerfile File debian-stretch-jenkins/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/16867/1/debian-stretch-jenkins/Dockerfile at 4 PS1, Line 4: # Make "$DEBIAN_VERSION" available after FROM It might be useful to add some comment here at the top of the file explaining what this container is used for, what other related projects/script/configs exist where, etc. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:47:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:48:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:48:21 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile File debian-buster-erlang/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile at 49 PS1, Line 49: WORKDIR /home/osmocom > I'd make sense to change WORKDIR to /home/build. actually, it not only makes sense, but it's a requirement. The useradd will only create /user/build, and /user/osmocom will not even exist. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:48:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:48:28 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:48:28 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: Hello pespin, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/16868 to look at the new patch set (#2). Change subject: debian-buster-erlang: rename user to "build" ...................................................................... debian-buster-erlang: rename user to "build" Match username of debian-stretch-jenkins, so we can use the same docker arguments for both images in gerrit-verifications.yml of osmo-ci.git. Related: OS#4345 Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd --- M debian-buster-erlang/Dockerfile 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/16868/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:48:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:48:45 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile File debian-buster-erlang/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/16868/1/debian-buster-erlang/Dockerfile at 49 PS1, Line 49: WORKDIR /home/osmocom > I'd make sense to change WORKDIR to /home/build. Ack -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:48:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:48:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:48:50 +0000 Subject: Change in osmo-trx[master]: smpl_buf: Fix str_code() param and print unknown error val In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16837 ) Change subject: smpl_buf: Fix str_code() param and print unknown error val ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 Gerrit-Change-Number: 16837 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:48:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:48:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 14:48:59 +0000 Subject: Change in osmo-trx[master]: lms: Improve smpl_buf error logging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16838 ) Change subject: lms: Improve smpl_buf error logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 Gerrit-Change-Number: 16838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:48:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:50:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:50:32 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... Patch Set 1: Can you document here what's the expected procedure to have symlink created and so on? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:50:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jan 2020 14:50:57 +0000 Subject: Change in osmo-trx[master]: smpl_buf: Fix str_code() param and print unknown error val In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16837 ) Change subject: smpl_buf: Fix str_code() param and print unknown error val ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 Gerrit-Change-Number: 16837 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:50:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:53:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:53:03 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/master-builds.yml at 44 PS1, Line 44: docker_img: 'debian-stretch-jenkins' in the gerrit yml you use $USER/debian-stretch-jenkins. What's the difference? https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/osmo-gsm-tester-runner.yml File jobs/osmo-gsm-tester-runner.yml: https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/osmo-gsm-tester-runner.yml at 244 PS1, Line 244: debian-stretch-jenkins /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' You can take the chance to "debian-stretch-jenkins \" and move cmd to next line. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:53:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:55:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:55:07 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: introduce "gerrit_url" var In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16869 ) Change subject: gerrit-verifications: introduce "gerrit_url" var ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 Gerrit-Change-Number: 16869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:55:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:55:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jan 2020 14:55:35 +0000 Subject: Change in osmo-trx[master]: lms: Improve smpl_buf error logging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16838 ) Change subject: lms: Improve smpl_buf error logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 Gerrit-Change-Number: 16838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:55:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:56:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 14:56:04 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 14:57:34 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 14 Jan 2020 14:57:34 +0000 Subject: Change in osmo-trx[master]: lms: Change radioDevice constructor arg name to avoid masking instanc... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16847 ) Change subject: lms: Change radioDevice constructor arg name to avoid masking instance attr ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 14:57:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:16:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jan 2020 15:16:20 +0000 Subject: Change in osmo-trx[master]: lms: Change radioDevice constructor arg name to avoid masking instanc... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16847 ) Change subject: lms: Change radioDevice constructor arg name to avoid masking instance attr ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 15:16:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:34:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:34:24 +0000 Subject: Change in osmo-trx[master]: lms: Change radioDevice constructor arg name to avoid masking instanc... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16847 ) Change subject: lms: Change radioDevice constructor arg name to avoid masking instance attr ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 15:34:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:34:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:34:27 +0000 Subject: Change in osmo-trx[master]: smpl_buf: Fix str_code() param and print unknown error val In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16837 ) Change subject: smpl_buf: Fix str_code() param and print unknown error val ...................................................................... smpl_buf: Fix str_code() param and print unknown error val Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 --- M Transceiver52M/device/common/smpl_buf.cpp M Transceiver52M/device/common/smpl_buf.h 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/common/smpl_buf.cpp b/Transceiver52M/device/common/smpl_buf.cpp index 33161bc..ceca000 100644 --- a/Transceiver52M/device/common/smpl_buf.cpp +++ b/Transceiver52M/device/common/smpl_buf.cpp @@ -154,7 +154,7 @@ return ost.str(); } -std::string smpl_buf::str_code(ssize_t code) +std::string smpl_buf::str_code(int code) { switch (code) { case ERROR_TIMESTAMP: @@ -166,6 +166,8 @@ case ERROR_OVERFLOW: return "Sample buffer: Overrun"; default: - return "Sample buffer: Unknown error"; + std::stringstream ss; + ss << "Sample buffer: Unknown error " << code; + return ss.str(); } } diff --git a/Transceiver52M/device/common/smpl_buf.h b/Transceiver52M/device/common/smpl_buf.h index ab612de..0b49b82 100644 --- a/Transceiver52M/device/common/smpl_buf.h +++ b/Transceiver52M/device/common/smpl_buf.h @@ -68,7 +68,7 @@ @param code an error code @return a formatted error string */ - static std::string str_code(ssize_t code); + static std::string str_code(int code); enum err_code { ERROR_TIMESTAMP = -1, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I95fadac15b9ad337ebc7cfb44a20dcf803ff8a47 Gerrit-Change-Number: 16837 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:34:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:34:28 +0000 Subject: Change in osmo-trx[master]: lms: Improve smpl_buf error logging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16838 ) Change subject: lms: Improve smpl_buf error logging ...................................................................... lms: Improve smpl_buf error logging Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b8893fb..3a10983 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -708,8 +708,9 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->read(bufs[i], len, timestamp); if ((rc < 0) || (rc != len)) { - LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc); - LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp); + LOGCHAN(i, DDEV, ERROR) << rx_buffers[i]->str_code(rc) << ". " + << rx_buffers[i]->str_status(timestamp) + << ", (len=" << len << ")"; return 0; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I511abe2c333443b978a3767bd7b7e320e07c4930 Gerrit-Change-Number: 16838 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:34:29 +0000 Subject: Change in osmo-trx[master]: lms: Change radioDevice constructor arg name to avoid masking instanc... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16847 ) Change subject: lms: Change radioDevice constructor arg name to avoid masking instance attr ...................................................................... lms: Change radioDevice constructor arg name to avoid masking instance attr channel number mangling based on multi-arfcn feature being enabled was moved to generic radioDevice() to reuse code. Hence, the generic parent constructor sets this->chans to 1 if multi-arfcn feature is requested. However, LMSDevice constructor argument had same name as the class instance attribute, taking preference. As a result, if multi-arfcn is enabled in LMSDevice, the generic constructor first sets this->chans=1 but afterwards LMSDEvice constructor keeps calling .resize() with the argument value "chans" instead of using this->chans. Let's rename the argument in all radioDevice child class constructors to avoid potential future bugs in all of them. Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h 6 files changed, 9 insertions(+), 9 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 3a10983..cb0129a 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -44,10 +44,10 @@ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) #define SAMPLE_BUF_SZ (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */ -LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, +LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), + RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), m_lms_dev(NULL), started(false) { LOGC(DDEV, INFO) << "creating LMS device..."; diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 003d064..cdba72c 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -72,7 +72,7 @@ public: /** Object constructor */ - LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, + LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); ~LMSDevice(); diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 8bab882..5d267c8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -189,10 +189,10 @@ #endif uhd_device::uhd_device(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, + InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), + : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), tx_gain_min(0.0), tx_gain_max(0.0), rx_gain_min(0.0), rx_gain_max(0.0), tx_spp(0), rx_spp(0), diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index 44f7ebb..d485a8e 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -62,7 +62,7 @@ class uhd_device : public RadioDevice { public: uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type, - size_t chans, double offset, + size_t chan_num, double offset, const std::vector& tx_paths, const std::vector& rx_paths); ~uhd_device(); diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 03a4f80..766a228 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -61,10 +61,10 @@ const double USRPDevice::masterClockRate = 52.0e6; USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, - size_t chans, double lo_offset, + size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths) + RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths) { LOGC(DDEV, INFO) << "creating USRP device..."; diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index 6dfa5f0..47f2a43 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -95,7 +95,7 @@ public: /** Object constructor */ - USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, + USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21 Gerrit-Change-Number: 16847 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:35:05 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 15:35:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:35:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:35:50 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: introduce "gerrit_url" var In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16869 ) Change subject: gerrit-verifications: introduce "gerrit_url" var ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 Gerrit-Change-Number: 16869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jan 2020 15:35:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:39:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:39:33 +0000 Subject: Change in osmo-ci[master]: jobs/gerrit-verifications.yml: add erlang repos In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16872 ) Change subject: jobs/gerrit-verifications.yml: add erlang repos ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 Gerrit-Change-Number: 16872 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jan 2020 15:39:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 15:39:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 15:39:36 +0000 Subject: Change in osmo-ci[master]: jobs/gerrit-verifications.yml: add erlang repos In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16872 ) Change subject: jobs/gerrit-verifications.yml: add erlang repos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 Gerrit-Change-Number: 16872 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jan 2020 15:39:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 16:06:44 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 14 Jan 2020 16:06:44 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... libmsc: SMS, Avoid premature RP-ACK to MS The was one libmsc commit to openbsc that is thus far missing in osmo-msc. This commit completed the work on delayed response from an ESME. Without this patch, the SMR sends an RP-ACK to the mobile station, and subsequently a DELIVER_SM_REPONSE from the ESME prokokes either a second RP-ACK, or an RP-ERROR; both of which result in "unhandled at this state (IDLE)" from the SMR After this patch, we have two things corrected: 1) RP-ERROR respects Deliver-SM error cause. 2) No more "unhandled as this state" error from the SMR Extract from original commit message: -------- libmsc: annotate esme route in the sms object from deliver_to_esme() Annotate this esme route, so we can use it to return -EINPROGRESS to skip sending premature RP-ACK to the mobile station, in case we're handling sms routes through SMPP. -------- Fixes: #OS4351 Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b --- M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/16873/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index ae19b27..5c26929 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -629,6 +629,10 @@ rc = sms_route_mt_sms(trans, gsms); + /* This SMS got routed through SMPP and we are waiting on the response. */ + if (gsms->smpp.esme) { + return -EINPROGRESS; + } /* * This SMS got routed through SMPP or no receiver exists. * In any case, we store it in the database for further processing. @@ -717,8 +721,10 @@ return gsm411_send_rp_ack(trans, rph->msg_ref); else if (rc > 0) return gsm411_send_rp_error(trans, rph->msg_ref, rc); - else - return rc; + else if (rc == -EINPROGRESS) + rc = 0; + + return rc; } /* Receive a 04.11 RP-DATA message in accordance with Section 7.3.1.2 */ diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 98b3b53..a79b252 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -773,6 +773,10 @@ if (ret < 0) return ret; + OSMO_ASSERT(!sms->smpp.esme); + smpp_esme_get(esme); + sms->smpp.esme = esme; + return smpp_cmd_enqueue(esme, vsub, sms, deliver.sequence_number); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 16:08:24 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 14 Jan 2020 16:08:24 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... libmsc: SMS, Avoid premature RP-ACK to MS There was one libmsc commit to openbsc that was thus far missing in osmo-msc. This commit completes the work on delayed response from an ESME. Without this patch, the SMR sends an RP-ACK to the mobile station, and subsequently a DELIVER_SM_REPONSE from the ESME prokokes either a second RP-ACK, or an RP-ERROR; both of which result in "unhandled at this state (IDLE)" from the SMR After this patch, we have two things corrected: 1) RP-ERROR respects Deliver-SM error cause. 2) No more "unhandled as this state" error from the SMR Extract from original commit message: -------- libmsc: annotate esme route in the sms object from deliver_to_esme() Annotate this esme route, so we can use it to return -EINPROGRESS to skip sending premature RP-ACK to the mobile station, in case we're handling sms routes through SMPP. -------- Fixes: #OS4351 Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b --- M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/16873/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 16:38:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jan 2020 16:38:53 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 2: Code-Review-2 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16873/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16873/2//COMMIT_MSG at 2 PS2, Line 2: Keith Whyte Please make sure to indicate actual author of the original patch - Pablo Neira Ayuso. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 14 Jan 2020 16:38:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 17:24:57 2020 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 14 Jan 2020 17:24:57 +0000 Subject: Change in simtrace2[master]: add script to flash latest firmware References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16874 ) Change subject: add script to flash latest firmware ...................................................................... add script to flash latest firmware this python script lists the SIMtrace 2 devices connected to USB and will flash the latest version of the application (if necessary). it requires pyusb and dfu-util. it is intended for end users so they don't need to read the length and error-prone instructions provided in the wiki. TODO: - support updating bootloader (once dfu-ram image exists) - use python implementation of dfu-util to be python only Change-Id: I3ebe0f54b6e3b7b45478603cc0a5b56e87b1f461 --- A contrib/flash.py 1 file changed, 162 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/16874/1 diff --git a/contrib/flash.py b/contrib/flash.py new file mode 100755 index 0000000..435d311 --- /dev/null +++ b/contrib/flash.py @@ -0,0 +1,162 @@ +#!/usr/bin/env python +# encoding: utf-8 +# python: 3.8.1 + +# library to enumerate USB devices +import usb.core +from usb.util import * +# more elegant structure +from typing import NamedTuple +# regular expressions utilities +import re +# open utilities to handle files +import os, sys +# to download the firmwares +import urllib.request +# to flash using DFU-util +import subprocess + +# SIMtrace 2 device information +class Device(NamedTuple): + usb_vendor_id: int + usb_product_id: int + name: str + url: dict # 1: sniff/trace firmware, 2: card emulation firmware + +# SIMtrace 2 devices definitions +DEVICE_SIMTRACE = Device(usb_vendor_id=0x1d50, usb_product_id=0x60e3, name="SIMtrace 2", url={"trace": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-trace-dfu-latest.bin", "cardem": "https://osmocom.org/attachments/download/3868/simtrace-cardem-dfu.bin"}) +DEVICE_QMOD = Device(usb_vendor_id=0x1d50, usb_product_id=0x4004, name="sysmoQMOD (Quad Modem)", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/qmod-cardem-dfu-latest.bin"}) +DEVICE_OWHW = Device(usb_vendor_id=0x1d50, usb_product_id=0x4001, name="OWHW", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/owhw-cardem-dfu-latest.bin"}) +DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD] + +# which firmware does the SIMtrace USN interface subclass correspond +FIRMWARE_SUBCLASS = {1: "trace", 2: "cardem"} + +def print_help(): + print("this script will flash SIMtrace 2 - based devices") + print("when no argument is provided, it will try to flash the application firmware of all SIMtrace 2 devices connected to USB with the latest version") + print("to flash a specific firmware, provide the name as argument") + print("the possible firmwares are: trace, cardem") + print("to list all devices connected to USB, provide the argument \"list\"") + +# the firmware to flash +to_flash = None + +# parse command line argument +if len(sys.argv) == 2: + to_flash = sys.argv[1] +if to_flash not in ["list", "trace", "cardem"] and len(sys.argv) > 1: + print_help() + exit(0) + +# get all USB devices +devices = [] +devices_nb = 0 +updated_nb = 0 +usb_devices = usb.core.find(find_all=True) +for usb_device in usb_devices: + # find SIMtrace devices + definitions = list(filter(lambda x: x.usb_vendor_id == usb_device.idVendor and x.usb_product_id == usb_device.idProduct, DEVICES)) + if 1 != len(definitions): + continue + devices_nb += 1 + definition = definitions[0] + serial = usb_device.serial_number or "unknown" + usb_path = str(usb_device.bus) + "-" + ".".join(map(str, usb_device.port_numbers)) + print("found " + definition.name + " device (chip ID " + serial + ") at USB path " + usb_path) + # determine if we are running DFU (in most cases the bootloader, but could also be the application) + dfu_interface = None + for configuration in usb_device: + # get DFU interface descriptor + dfu_interface = dfu_interface or find_descriptor(configuration, bInterfaceClass=254, bInterfaceSubClass=1) + if (None == dfu_interface): + print("no DFU USB interface found") + continue + dfu_mode = (2 == dfu_interface.bInterfaceProtocol) # InterfaceProtocol 1 is runtime mode, 2 is DFU mode + # determine firmware type (when not in DFU mode) + firmware = None + simtrace_interface = None + for configuration in usb_device: + simtrace_interface = simtrace_interface or find_descriptor(configuration, bInterfaceClass=255) + if simtrace_interface and simtrace_interface.bInterfaceSubClass in FIRMWARE_SUBCLASS: + firmware = firmware or FIRMWARE_SUBCLASS[simtrace_interface.bInterfaceSubClass] + if dfu_mode: + firmware = 'dfu' + if firmware: + print("installed firmware: " + firmware) + else: + print("unknown installed firmware") + continue + # determine version of the application/bootloader firmware + version = None + version_interface = None + for configuration in usb_device: + # get custom interface with string + version_interface = version_interface or find_descriptor(configuration, bInterfaceClass=255, bInterfaceSubClass=255) + if version_interface and version_interface.iInterface and version_interface.iInterface > 0 and get_string(usb_device, version_interface.iInterface): + version = get_string(usb_device, version_interface.iInterface) + if not version: + # the USB serial is set (in the application) since version 0.5.1.34-e026 from 2019-08-06 + # https://git.osmocom.org/simtrace2/commit/?id=e0265462d8c05ebfa133db2039c2fbe3ebbd286e + # the USB serial is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18 + # https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a + # the firmware version is set (in the application) since version 0.5.1.37-ede8 from 2019-08-13 + # https://git.osmocom.org/simtrace2/commit/?id=ede87e067dadd07119f24e96261b66ac92b3af6f + # the firmware version is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18 + # https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a + if dfu_mode: + if serial: + version = "< 0.5.1.45-ac7e" + else: + versoin = "< 0.5.1.45-ac7e" + else: + if serial: + version = "< 0.5.1.37-ede8" + else: + versoin = "< 0.5.1.34-e026" + print("device firmware version: " + version) + # flash latest firmware + if to_flash == "list": # we just want to list the devices, not flash them + continue + # check the firmware exists + if firmware == "dfu" and to_flash is None: + print("device is currently in DFU mode. you need to specify which firmware to flash") + continue + to_flash = to_flash or firmware + if to_flash not in definition.url.keys(): + print("no firmware image available for " + firmware + " firmware") + continue + # download firmware + try: + dl_path, header = urllib.request.urlretrieve(definition.url[to_flash]) + except: + print("could not download firmware " + definition.url[to_flash]) + continue + dl_file = open(dl_path, "rb") + dl_data = dl_file.read() + dl_file.close() + # compare versions + dl_version = re.search(b'firmware \d+\.\d+\.\d+\.\d+-[0-9a-fA-F]{4}', dl_data) + if dl_version is None: + print("could not get version from downloaded firmware image") + os.remove(dl_path) + continue + dl_version = dl_version.group(0).decode("utf-8").split(" ")[1] + print("latest firmware version: " + dl_version) + versions = list(map(lambda x: int(x), version.split(" ")[-1].split("-")[0].split("."))) + dl_versions = list(map(lambda x: int(x), dl_version.split("-")[0].split("."))) + dl_newer = (versions[0] < dl_versions[0] or (versions[0] == dl_versions[0] and versions[1] < dl_versions[1]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] < dl_versions[2]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] == dl_versions[2] and versions[3] < dl_versions[3])) + if not dl_newer: + print("no need to flash latest version") + os.remove(dl_path) + continue + print("flashing latest version") + dfu_result = subprocess.run(["dfu-util", "--device", hex(definition.usb_vendor_id) + ":" + hex(definition.usb_product_id), "--path", usb_path, "--cfg", "1", "--alt", "1", "--reset", "--download", dl_path]) + os.remove(dl_path) + if 0 != dfu_result.returncode: + printf("flashing firmware using dfu-util failed. ensure dfu-util is installed and you have the permissions to access this USB device") + continue + updated_nb += 1 + +print(str(devices_nb)+ " SIMtrace 2 device(s) found") +print(str(updated_nb)+ " SIMtrace 2 device(s) updated") -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ebe0f54b6e3b7b45478603cc0a5b56e87b1f461 Gerrit-Change-Number: 16874 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 19:24:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 19:24:13 +0000 Subject: Change in osmo-trx[master]: lms: Move rx_buffers allocation to constructor References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16875 ) Change subject: lms: Move rx_buffers allocation to constructor ...................................................................... lms: Move rx_buffers allocation to constructor Release is done in destructor, so let's move allocation to constructor since there's really no need to have them in open() which is already quite complex and large. Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/16875/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index cb0129a..a533e7e 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -58,6 +58,11 @@ tx_gains.resize(chans); rx_buffers.resize(chans); + + /* Set up per-channel Rx timestamp based Ring buffers */ + for (size_t i = 0; i < rx_buffers.size(); i++) + rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); + } LMSDevice::~LMSDevice() @@ -243,10 +248,6 @@ goto out_close; } - /* Set up per-channel Rx timestamp based Ring buffers */ - for (size_t i = 0; i < rx_buffers.size(); i++) - rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); - return NORMAL; out_close: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 Gerrit-Change-Number: 16875 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 19:24:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 19:24:13 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... lms: Store device type specific parameters in one place Add an enum containing each supported device type (LimeSDR-USB, LimeSDR-Mini and LimeNet-Micro) plus "unknown", to leave some room for yet-to-come devices to run with some generic parameters without rebuilding osmo-trx. Each device type is assigned a dev_desc structure, and all of them are put in HashMap, similar to what's already done in UHDDevice.cpp. Device type is infered from string provided by LMS_GetDeviceInfo(), as it was already done before in several places. From now on, we only need to parse the string once since we store the device type after first during open time. Later on, more fields will be moved to device-type specific structure, such as Tx timing offset, clock rate, etc. Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 89 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/76/16876/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index a533e7e..2e164ed 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -20,6 +20,9 @@ #include #include #include + +#include + #include "Logger.h" #include "Threads.h" #include "LMSDevice.h" @@ -44,11 +47,62 @@ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) #define SAMPLE_BUF_SZ (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */ + +/* Device Name Prefixes as presented by LimeSuite API LMS_GetDeviceInfo(): */ +#define LMS_DEV_SDR_USB_PREFIX_NAME "LimeSDR-USB" +#define LMS_DEV_SDR_MINI_PREFIX_NAME "LimeSDR-Mini" +#define LMS_DEV_NET_MICRO_PREFIX_NAME "LimeNET-Micro" + +/* Device parameter descriptor */ +struct dev_desc { + /* Does LimeSuite allow switching the clock source for this device? + * LimeSDR-Mini does not have switches but needs soldering to select + * external/internal clock. Any call to LMS_SetClockFreq() will fail. + */ + bool clock_src_switchable; + /* Does LimeSuite allow using REF_INTERNAL for this device? + * LimeNET-Micro does not like selecting internal clock + */ + bool clock_src_int_usable; + /* Device specific maximum tx levels selected by phasenoise measurements, in dB */ + double max_tx_gain; + /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ + std::string name_prefix; +}; + +static const std::map dev_param_map { + { LMS_DEV_SDR_USB, { true, true, 73.0, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, "UNKNOWN" } }, +}; + +static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) +{ + std::map::const_iterator it = dev_param_map.begin(); + + const lms_dev_info_t* device_info = LMS_GetDeviceInfo(m_lms_dev); + + // Iterate over the map using Iterator till end. + while (it != dev_param_map.end()) + { + enum lms_dev_type dev_type = it->first; + struct dev_desc desc = it->second; + + if (strncmp(device_info->deviceName, desc.name_prefix.c_str(), desc.name_prefix.length()) == 0) { + LOGC(DDEV, INFO) << "Device identified as " << desc.name_prefix; + return dev_type; + } + it++; + } + return LMS_DEV_UNKNOWN; +} + LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), - m_lms_dev(NULL), started(false) + m_lms_dev(NULL), started(false), dev_type(LMS_DEV_UNKNOWN) { LOGC(DDEV, INFO) << "creating LMS device..."; @@ -138,11 +192,11 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels) { lms_info_str_t* info_list; - const lms_dev_info_t* device_info; lms_range_t range_sr; float_type sr_host, sr_rf; unsigned int i, n; int rc, dev_id; + struct dev_desc dev_desc; LOGC(DDEV, INFO) << "Opening LMS device.."; @@ -179,20 +233,24 @@ delete [] info_list; - device_info = LMS_GetDeviceInfo(m_lms_dev); + dev_type = parse_dev_type(m_lms_dev); + dev_desc = dev_param_map.at(dev_type); if ((ref != REF_EXTERNAL) && (ref != REF_INTERNAL)){ LOGC(DDEV, ERROR) << "Invalid reference type"; goto out_close; } - /* if reference clock is external setup must happen _before_ calling LMS_Init */ + /* if reference clock is external, setup must happen _before_ calling LMS_Init */ /* FIXME make external reference frequency configurable */ - if (ref == REF_EXTERNAL) { + if (dev_desc.clock_src_switchable && ref == REF_EXTERNAL) { LOGC(DDEV, INFO) << "Setting External clock reference to 10MHz"; /* Assume an external 10 MHz reference clock */ if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0) goto out_close; + } else { + LOGC(DDEV, INFO) << "Device type " << dev_desc.name_prefix + << " doesn't support switching clock source through SW"; } LOGC(DDEV, INFO) << "Init LMS device"; @@ -201,22 +259,23 @@ goto out_close; } - /* LimeSDR-Mini does not have switches but needs soldering to select external/internal clock */ - /* LimeNET-Micro also does not like selecting internal clock*/ - /* also set device specific maximum tx levels selected by phasenoise measurements*/ - if (strncmp(device_info->deviceName,"LimeSDR-USB",11) == 0){ - /* if reference clock is internal setup must happen _after_ calling LMS_Init */ - /* according to lms using LMS_CLOCK_EXTREF with a frequency <= 0 is the correct way to set clock to internal reference*/ - if (ref == REF_INTERNAL) { - LOGC(DDEV, INFO) << "Setting Internal clock reference"; - if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, -1) < 0) - goto out_close; + /* if reference clock is internal, setup must happen _after_ calling LMS_Init */ + if (dev_desc.clock_src_switchable && ref == REF_INTERNAL) { + LOGC(DDEV, INFO) << "Setting Internal clock reference"; + if (!dev_desc.clock_src_int_usable) { + LOGC(DDEV, ERROR) << "Device type " << dev_desc.name_prefix + << " doesn't support internal reference clock"; + goto out_close; } - maxTxGainClamp = 73.0; - } else if (strncmp(device_info->deviceName,"LimeSDR-Mini",12) == 0) - maxTxGainClamp = 66.0; - else - maxTxGainClamp = 71.0; /* "LimeNET-Micro", etc FIXME pciE based LMS boards?*/ + /* According to lms using LMS_CLOCK_EXTREF with a + frequency <= 0 is the correct way to set clock to + internal reference*/ + if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, -1) < 0) + goto out_close; + } else { + LOGC(DDEV, INFO) << "Device type " << dev_desc.name_prefix + << " doesn't support switching clock source through SW"; + } /* enable all used channels */ for (i=0; i tx_gains, rx_gains; - double maxTxGainClamp; + + enum lms_dev_type dev_type; bool do_calib(size_t chan); bool do_filters(size_t chan); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 19:24:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 19:24:13 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... lms: Make ts_offset and smpl rate coefs device-specific Right now the values are the same for all devices, but they will differ in forthcoming commits once multi-arfcn support is added. Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/77/16877/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 2e164ed..d9cc371 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -66,15 +66,19 @@ bool clock_src_int_usable; /* Device specific maximum tx levels selected by phasenoise measurements, in dB */ double max_tx_gain; + /* Sample rate coef (without having TX/RX samples per symbol into account) */ + double rate; + /* Coefficient multiplied by TX sample rate in order to shift Tx time */ + double ts_offset_coef; /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ std::string name_prefix; }; static const std::map dev_param_map { - { LMS_DEV_SDR_USB, { true, true, 73.0, LMS_DEV_SDR_USB_PREFIX_NAME } }, - { LMS_DEV_SDR_MINI, { false, true, 66.0, LMS_DEV_SDR_MINI_PREFIX_NAME } }, - { LMS_DEV_NET_MICRO, { true, false, 71.0, LMS_DEV_NET_MICRO_PREFIX_NAME } }, - { LMS_DEV_UNKNOWN, { true, true, 73.0, "UNKNOWN" } }, + { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, 8.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, 8.9e-5, "UNKNOWN" } }, }; static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) @@ -290,16 +294,16 @@ goto out_close; print_range("Sample Rate", &range_sr); - LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; - if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0) + sr_host = dev_desc.rate * tx_sps; + LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps; + if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0) goto out_close; if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf)) goto out_close; LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; - /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */ - ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */ + ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); /* configure antennas */ if (!set_antennas()) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 19:24:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 19:24:14 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... lms: Initial multi-arfcn support With current state multi-arfcn can be used (eg. I can place a call between 2 phones using TRX1 and sustain for as long as wanted), but from time to time (around every 20seconds), a burst of Tx packed dropped events from LimeSuite appears. LimeNet-micro coefficients have yet not been tested. Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/16878/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index d9cc371..7d67158 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -68,17 +68,21 @@ double max_tx_gain; /* Sample rate coef (without having TX/RX samples per symbol into account) */ double rate; + /* Sample rate coef (without having TX/RX samples per symbol into account), if multi-arfcn is enabled */ + double rate_multiarfcn; /* Coefficient multiplied by TX sample rate in order to shift Tx time */ double ts_offset_coef; + /* Coefficient multiplied by TX sample rate in order to shift Tx time, if multi-arfcn is enabled */ + double ts_offset_coef_multiarfcn; /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ std::string name_prefix; }; static const std::map dev_param_map { - { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, - { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, - { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, 8.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, - { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, 8.9e-5, "UNKNOWN" } }, + { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 8.2e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, "UNKNOWN" } }, }; static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) @@ -294,7 +298,10 @@ goto out_close; print_range("Sample Rate", &range_sr); - sr_host = dev_desc.rate * tx_sps; + if (iface == MULTI_ARFCN) + sr_host = dev_desc.rate_multiarfcn * tx_sps; + else + sr_host = dev_desc.rate * tx_sps; LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps; if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0) goto out_close; @@ -303,7 +310,10 @@ goto out_close; LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; - ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); + if (iface == MULTI_ARFCN) + ts_offset = static_cast(dev_desc.ts_offset_coef_multiarfcn * sr_host); + else + ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); /* configure antennas */ if (!set_antennas()) { @@ -311,7 +321,7 @@ goto out_close; } - return NORMAL; + return iface == MULTI_ARFCN ? MULTI_ARFCN : NORMAL; out_close: LOGC(DDEV, FATAL) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 19:31:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jan 2020 19:31:12 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 to look at the new patch set (#2). Change subject: lms: Initial multi-arfcn support ...................................................................... lms: Initial multi-arfcn support With current state multi-arfcn can be used (eg. I can place a call between 2 phones using TRX1 and sustain for as long as wanted), but from time to time (around every 20seconds), a burst of Tx packed dropped events from LimeSuite appears. LimeNet-micro coefficients have yet not been tested. Related: OS#4362 Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/16878/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 14 21:24:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jan 2020 21:24:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update Socket-API + IPL4 upstream tags References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 ) Change subject: deps/Makefile: Update Socket-API + IPL4 upstream tags ...................................................................... deps/Makefile: Update Socket-API + IPL4 upstream tags Change-Id: I557f1515528ac3a90b34c1fb647d88a1989fea37 --- M deps/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/16879/1 diff --git a/deps/Makefile b/deps/Makefile index 012b925..043aaa3 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -108,11 +108,11 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-5-g86b7d7f +titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.GPIO_commit= R.2.A-8-g9728492 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -titan.TestPorts.IPL4asp_commit= R.30.C-3-g24f0681 +titan.TestPorts.IPL4asp_commit= R.30.E titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265 titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 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: I557f1515528ac3a90b34c1fb647d88a1989fea37 Gerrit-Change-Number: 16879 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 02:15:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 02:15:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update Socket-API + IPL4 upstream tags In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 ) Change subject: deps/Makefile: Update Socket-API + IPL4 upstream tags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 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: I557f1515528ac3a90b34c1fb647d88a1989fea37 Gerrit-Change-Number: 16879 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 02:15:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 02:16:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 02:16:47 +0000 Subject: Change in osmo-trx[master]: lms: Move rx_buffers allocation to constructor In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16875 ) Change subject: lms: Move rx_buffers allocation to constructor ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 Gerrit-Change-Number: 16875 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 02:16:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 02:32:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 02:32:45 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 1: (6 comments) https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h File Transceiver52M/device/lms/LMSDevice.h: https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h at 48 PS1, Line 48: LMS_DEV_UNKNOWN Maybe rather keep this one first, so it will be 0? https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h at 70 PS1, Line 70: dev_type Also, how about adding prefix 'm_'? https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h at 70 PS1, Line 70: dev_type ... so unless we explicitly initialize this field, we fall-back to UNKNOWN? (see my comment above) https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 51 PS1, Line 51: Device Name Prefixes How about using value_string array here? https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 245 PS1, Line 245: /* FIXME make external reference frequency configurable */ should we still keep this comment? As far as I can see, you're checking if it's supported now... https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 275 PS1, Line 275: else So if !dev_desc.clock_src_switchable, we would print this log message twice? Or at least once if it's actually supported. Maybe you need a conditional else branch: ... } else if (!dev_desc.clock_src_switchable) { ... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 02:32:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 02:39:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 02:39:07 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16877/1/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16877/1/Transceiver52M/device/lms/LMSDevice.cpp at 297 PS1, Line 297: host host? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 02:39:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 02:47:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 02:47:54 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp at 83 PS2, Line 83: 8.9e-5, 8.2e-5 Is it really the same given that sampling frequency is different? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 02:47:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:46:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:46:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 ) Change subject: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() ...................................................................... MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() Change-Id: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 --- M msc/MSC_Tests.ttcn 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/16880/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 177c2f8..642eeb4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1962,21 +1962,20 @@ timer T := 20.0; T.start alt { - [pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) - { - setverdict(fail, "paging seems not to stop!"); - mtc.stop; + [pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; } - [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { - setverdict(fail, "paging seems not to stop!"); - mtc.stop; + [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message received"); - self.stop; + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; } - [] T.timeout { - setverdict(pass); + [] T.timeout { + setverdict(pass); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 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: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 Gerrit-Change-Number: 16880 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:46:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:46:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#3880 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#3880 ...................................................................... MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#3880 This test case reproduces the problem described in OS#3880: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. MSC prematurely responds with RP-ACK to the MS/UE; 3. ESME responds with DELIVER-SM error; 4. SMS transaction is already terminated (by RP-ACK). Expected behaviour: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. ESME responds with DELIVER-SM error; 3. MSC terminates the SMS transaction with RP-ERROR. Change-Id: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Related: OS#3880 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/16882/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2859067..63cf2b1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2114,6 +2114,50 @@ f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); } +/* Test case for OS#3880: make sure that RP-ERROR from ESME is properly sent to the MS/UE */ +friend function f_tc_smpp_mo_sms_rp_error(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var SMPP_PDU smpp_pdu; + timer T := 3.0; + + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + /* MS/UE submits a MO SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + f_mo_sms_submit(spars); + + /* ESME responds with an error (Invalid Destination Address) */ + T.start; + alt { + [] SMPP.receive(tr_SMPP(c_SMPP_command_id_deliver_sm, ESME_ROK, body := ?)) -> value smpp_pdu { + SMPP.send(ts_SMPP_DELIVER_SM_resp(ESME_RINVDSTADR, smpp_pdu.header.seq_num)); + } + [] SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for SMPP DELIVER-SM"); + mtc.stop; + } + } + + /* Expect RP-ERROR on BSSAP interface */ + spars.exp_rp_err := 1; /* FIXME: GSM411_RP_CAUSE_MO_NUM_UNASSIGNED */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_smpp_mo_sms_rp_error() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "default-route"); + vc_conn := f_start_handler(refers(f_tc_smpp_mo_sms_rp_error), 45); + vc_conn.done; + f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); +} + /* Test MO-SMS from MS/BTS/BSC towards HLR (via GSUP) */ friend function f_tc_gsup_mo_sms(charstring id, BSC_ConnHdlrPars pars) @@ -5857,6 +5901,7 @@ execute( TC_lu_and_mt_sms_paging_and_nothing() ); execute( TC_lu_and_mt_sms_paging_repeated() ); execute( TC_smpp_mo_sms() ); + execute( TC_smpp_mo_sms_rp_error() ); execute( TC_smpp_mt_sms() ); execute( TC_gsup_mo_sms() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 074eeb1..02f6882 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -54,6 +54,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:46:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:46:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print receive... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 ) Change subject: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU ...................................................................... MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU Change-Id: I862766ac87715d5ad141405f343f0563fd75150f --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/16881/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 642eeb4..2859067 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2162,8 +2162,7 @@ f_mo_sms_submit(spars); alt { [] GSUP.receive(mo_forwardSM) -> value gsup_msg_rx { - log("RX MO-forwardSM-Req"); - log(gsup_msg_rx); + log("RX MO-forwardSM-Req: ", gsup_msg_rx); setverdict(pass); } [] GSUP.receive { @@ -2219,8 +2218,7 @@ f_mo_smma(spars); alt { [] GSUP.receive(mo_ReadyForSM) -> value gsup_msg_rx { - log("RX MO-ReadyForSM-Req"); - log(gsup_msg_rx); + log("RX MO-ReadyForSM-Req: ", gsup_msg_rx); setverdict(pass); } [] GSUP.receive { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 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: I862766ac87715d5ad141405f343f0563fd75150f Gerrit-Change-Number: 16881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:46:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:46:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 ) Change subject: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms ...................................................................... MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms The MSC shall not send RP-ACK before the response from ESME. Change-Id: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Related: OS#3880 --- M msc/MSC_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16883/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 63cf2b1..9b015b1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2063,9 +2063,10 @@ /* Perform location update so IMSI is known + registered in MSC/VLR */ f_perform_lu(); - f_establish_fully(EST_TYPE_MO_SMS); - f_mo_sms(spars); + /* MS/UE submits a MO SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + f_mo_sms_submit(spars); var SMPP_PDU smpp; var template SMPP_PDU tr_smpp := tr_SMPP(c_SMPP_command_id_deliver_sm, ESME_ROK); @@ -2103,6 +2104,9 @@ [] SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)) { repeat; } } + /* MSC terminates the SMS transaction with RP-ACK */ + f_mo_sms_wait_rp_ack(spars); + f_expect_clear(); } testcase TC_smpp_mo_sms() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 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: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Gerrit-Change-Number: 16883 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:47:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:47:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 to look at the new patch set (#2). Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 This test case reproduces the problem described in OS#4351: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. MSC prematurely responds with RP-ACK to the MS/UE; 3. ESME responds with DELIVER-SM error; 4. SMS transaction is already terminated (by RP-ACK). Expected behaviour: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. ESME responds with DELIVER-SM error; 3. MSC terminates the SMS transaction with RP-ERROR. Change-Id: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Related: OS#4351 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/16882/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 04:47:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 04:47:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 ) Change subject: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms ...................................................................... MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms The MSC shall not send RP-ACK before the response from ESME. Change-Id: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Related: OS#4351 --- M msc/MSC_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16883/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 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: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Gerrit-Change-Number: 16883 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 05:41:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 05:41:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 ) Change subject: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT ...................................................................... library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT Change-Id: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 --- M library/L3_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/16884/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 6b5f5c2..cf7b9d9 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2996,7 +2996,7 @@ rP_Spare := '00000'B, rP_Message_Reference := msg_ref, rP_CauseLV := { - rP_LengthIndicator := 0, /* overwritten */ + rP_LengthIndicator := ?, rP_CauseV := { causeValue := f_cause_or_wc(cause), ext := '0'B -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 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: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 Gerrit-Change-Number: 16884 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 05:43:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 05:43:43 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 2: Verified+1 Verified by running the following TTCN-3 test cases: TC_smpp_mo_sms_rp_error (new) and TC_smpp_mo_sms (updated expectations). See https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/ and https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883/. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 05:43:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 08:38:01 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 08:38:01 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/16867 to look at the new patch set (#2). Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... debian-stretch-jenkins: move from osmo-ci.git Put Dockerfile_osmocom_jenkins.amd64 ("osmocom:deb9_amd64") from osmo-ci.git here and give it a more descriptive name. The image is used to run contrib/jenkins.sh scripts of most Osmocom projects. Move it to here, so we have all docker images in one place. In the future, osmo-ci.git will use more images from docker-playground.git in gerrit verification, such as debian-buster-erlang. Related: OS#4345 Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a --- A debian-stretch-jenkins/Dockerfile A debian-stretch-jenkins/Makefile 2 files changed, 150 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/16867/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 08:40:42 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 08:40:42 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... Patch Set 2: (1 comment) > Patch Set 1: > > Why do we move it here? Are we actually moving or copying it? We move it. I've extended the commit message to explain why. https://gerrit.osmocom.org/c/docker-playground/+/16867/1/debian-stretch-jenkins/Dockerfile File debian-stretch-jenkins/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/16867/1/debian-stretch-jenkins/Dockerfile at 4 PS1, Line 4: # Make "$DEBIAN_VERSION" available after FROM > It might be useful to add some comment here at the top of the file explaining what this container is [?] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 08:40:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 08:43:38 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 08:43:38 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: introduce "gerrit_url" var In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16869 ) Change subject: gerrit-verifications: introduce "gerrit_url" var ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 Gerrit-Change-Number: 16869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 08:43:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 08:43:43 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 08:43:43 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: introduce "gerrit_url" var In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16869 ) Change subject: gerrit-verifications: introduce "gerrit_url" var ...................................................................... gerrit-verifications: introduce "gerrit_url" var Prepare for erlang repositories, which will use this variable. Related: OS#4345 Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index ee193d6..dfc9b88 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -42,7 +42,8 @@ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: 'osmocom:deb9_amd64' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' - repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/{repos}' + gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' + repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' # in alphabetical order @@ -168,7 +169,7 @@ {docker_img} /build/contrib/jenkins.sh - osmo-python-tests: - repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' + repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - osmo-sgsn: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia91764797745b48ae832cfbc16976e561b288a50 Gerrit-Change-Number: 16869 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 09:27:49 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 09:27:49 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... docker_images_require: add symlink code path Make development easier by skipping fetch, checkout and reset --hard if _docker_playground is a symlink. Document _docker_playground in README.adoc and explain how to set up the symlink. Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 --- M README.adoc M scripts/common.sh 2 files changed, 27 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/16870/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 09:27:49 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 09:27:49 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... docker: move to docker-playground.git Instead of building "osmocom:deb9_amd64" from this repository, build "$USER/debian-stretch-jenkins" from docker-playground.git (same Dockerfile). Adjust all jobs to use the new image name. Add a new "update-osmo-ci-on-slaves-dp" jenkins job, which triggers the existing "update-osmo-ci-on-slaves" job whenever docker-playground.git changes. Replace docker/rebuild_osmocom_jenkins_image.sh with scripts/osmo-ci-docker-rebuild.sh, so we can get rid of the docker dir. I thought about dropping the script completely, and directly writing the two lines into contrib/jenkins.sh. But I kept the extra script for convenience, when testing locally. Related: OS#4345 Depends: docker-playground I125ae8a6bcabbd1f485028c79b0abacda0622c3a Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f --- M contrib/jenkins.sh D docker/Dockerfile_osmocom_jenkins.amd64 D docker/rebuild_osmocom_jenkins_image.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmo-gsm-tester-runner.yml M jobs/update-osmo-ci-on-slaves.yml A scripts/osmo-ci-docker-rebuild.sh 8 files changed, 34 insertions(+), 173 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/16871/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 09:28:00 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 09:28:00 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... Patch Set 2: > Patch Set 1: > > Can you document here what's the expected procedure to have symlink created and so on? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 09:28:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 09:32:01 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 09:32:01 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/master-builds.yml at 44 PS1, Line 44: docker_img: 'debian-stretch-jenkins' > in the gerrit yml you use $USER/debian-stretch-jenkins. [?] Good catch! '$USER/debian-stretch-jenkins' is the right one, without $USER it will not work. I had noticed that during testing: docker-playground.git is always building images with a $USER/ prefix. Fixed. https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/osmo-gsm-tester-runner.yml File jobs/osmo-gsm-tester-runner.yml: https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/jobs/osmo-gsm-tester-runner.yml at 244 PS1, Line 244: debian-stretch-jenkins /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' > You can take the chance to "debian-stretch-jenkins \" and move cmd to next line. Done https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/scripts/osmo-ci-docker-rebuild.sh File scripts/osmo-ci-docker-rebuild.sh: https://gerrit.osmocom.org/c/osmo-ci/+/16871/1/scripts/osmo-ci-docker-rebuild.sh at 5 PS1, Line 5: debian-stretch-jenkins (This is the only place in the patch where "debian-stretch-jenkins" is needed instead of "$USER/debian-stretch-jenkins") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 09:32:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 10:06:55 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 10:06:55 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 765 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/16885/1 diff --git a/configure.ac b/configure.ac index 1bcd2fe..55755ab 100644 --- a/configure.ac +++ b/configure.ac @@ -382,6 +382,7 @@ tests/sysmobts/Makefile tests/misc/Makefile tests/handover/Makefile + tests/ta_control/Makefile tests/tx_power/Makefile tests/power/Makefile tests/meas/Makefile diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index a15ce3d..668db32 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -2,4 +2,4 @@ oml.h paging.h rsl.h signal.h vty.h amr.h pcu_if.h pcuif_proto.h \ handover.h msg_utils.h tx_power.h control_if.h cbch.h l1sap.h \ power_control.h scheduler.h scheduler_backend.h phy_link.h \ - dtx_dl_amr_fsm.h + dtx_dl_amr_fsm.h ta_control.h diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index b2e7c0e..69c6bd6 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -44,7 +44,6 @@ uint16_t base_port_local; uint16_t base_port_remote; struct osmo_fd trx_ofd_clk; - bool trx_ta_loop; uint32_t clock_advance; uint32_t rts_advance; bool use_legacy_setbsic; diff --git a/include/osmo-bts/ta_control.h b/include/osmo-bts/ta_control.h new file mode 100644 index 0000000..75a110b --- /dev/null +++ b/include/osmo-bts/ta_control.h @@ -0,0 +1,6 @@ +#pragma once + +#include +#include + +void lchan_ms_ta_ctrl(struct gsm_lchan *lchan); diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 113ff2f..0a10abf 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -12,6 +12,6 @@ load_indication.c pcu_sock.c handover.c msg_utils.c \ tx_power.c bts_ctrl_commands.c bts_ctrl_lookup.c \ l1sap.c cbch.c power_control.c main.c phy_link.c \ - dtx_dl_amr_fsm.c scheduler_mframe.c + dtx_dl_amr_fsm.c scheduler_mframe.c ta_control.c libl1sched_a_SOURCES = scheduler.c diff --git a/src/common/measurement.c b/src/common/measurement.c index 3e0daf1..ee37990 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -696,6 +696,11 @@ lchan_meas_compute_extended(lchan); + /* Compute new ta_req value. This has to be done here since the value + * in lchan->meas.num_ul_meas together with lchan->meas.ms_toa256 + * is needed for the computation. */ + lchan_ms_ta_ctrl(lchan); + lchan->meas.num_ul_meas = 0; /* return 1 to indicate that the computation has been done and the next diff --git a/src/common/ta_control.c b/src/common/ta_control.c new file mode 100644 index 0000000..0b12c21 --- /dev/null +++ b/src/common/ta_control.c @@ -0,0 +1,51 @@ +/* Loop control for Timing Advance */ + +/* (C) 2013 by Andreas Eversberg + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +/* 90% of one bit duration in 1/256 symbols: 256*0.9 */ +#define TOA256_9OPERCENT 230 + +void lchan_ms_ta_ctrl(struct gsm_lchan *lchan) +{ + int16_t toa256 = lchan->meas.ms_toa256; + + /* Do not perform any computation when the amount of measurement + * results is too little. */ + if (lchan->meas.num_ul_meas < 4) + return; + + if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, + "TOA is too early (%d), now lowering TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta - 1); + lchan->rqd_ta--; + } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, + "TOA is too late (%d), now raising TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta + 1); + lchan->rqd_ta++; + } else + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, + "TOA is correct (%d), keeping current TA of %d\n", + toa256, lchan->rqd_ta); +} diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index eb25f64..823c2d7 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -35,63 +35,6 @@ #include "l1_if.h" #include "loops.h" -/* - * Timing Advance loop - */ - -/* 90% of one bit duration in 1/256 symbols: 256*0.9 */ -#define TOA256_9OPERCENT 230 - -void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256) -{ - /* check if the current L1 header acks to the current ordered TA */ - if (lchan->meas.l1_info[1] != lchan->rqd_ta) - return; - - /* sum measurement */ - chan_state->meas.toa256_sum += toa256; - if (++(chan_state->meas.toa_num) < 16) - return; - - /* complete set */ - toa256 = chan_state->meas.toa256_sum / chan_state->meas.toa_num; - - /* check for change of TOA */ - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) { - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", - toa256, lchan->rqd_ta, lchan->rqd_ta - 1); - lchan->rqd_ta--; - } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", - toa256, lchan->rqd_ta, lchan->rqd_ta + 1); - lchan->rqd_ta++; - } else - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is correct (%d), keeping current TA of %d\n", - toa256, lchan->rqd_ta); - - chan_state->meas.toa_num = 0; - chan_state->meas.toa256_sum = 0; -} - -/*! Process a SACCH event as input to the MS power control and TA loop. Function - * is called once every uplink SACCH block is received. - * \param l1t L1 TRX instance on which we operate - * \param chan_nr RSL channel number on which we operate - * \param chan_state L1 scheduler channel state of the channel on which we operate - * \param[in] rssi Receive Signal Strength Indication - * \param[in] toa256 Time of Arrival in 1/256 symbol periods */ -void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa256) -{ - struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] - .lchan[l1sap_chan2ss(chan_nr)]; - struct phy_instance *pinst = trx_phy_instance(l1t->trx); - - /* if TA loop is enabled, handle it */ - if (pinst->phy_link->u.osmotrx.trx_ta_loop) - ta_val(lchan, chan_state, toa256); -} - void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int n_errors, int n_bits_total) diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h index bc87860..1384960 100644 --- a/src/osmo-bts-trx/loops.h +++ b/src/osmo-bts-trx/loops.h @@ -11,9 +11,6 @@ * loops api */ -void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa); - void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int n_errors, int n_bits_total); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 00280ce..6671243 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -135,7 +135,6 @@ plink->u.osmotrx.base_port_remote = 5700; plink->u.osmotrx.clock_advance = 20; plink->u.osmotrx.rts_advance = 5; - plink->u.osmotrx.trx_ta_loop = true; /* attempt use newest TRXD version by default: */ plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER; } diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 2785d09..20d502f 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -954,12 +954,6 @@ } else memset(burst, 0, 58 * 2); - /* send burst information to loops process */ - if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { - trx_loop_sacch_input(l1t, trx_chan_desc[chan].chan_nr | bi->tn, - chan_state, bi->toa256); - } - /* wait until complete set of bursts */ if (bid != 3) return 0; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 5c5e477..4c17ff3 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -181,23 +181,19 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_timing_advance_loop, cfg_phy_timing_advance_loop_cmd, +DEFUN_DEPRECATED(cfg_phy_timing_advance_loop, cfg_phy_timing_advance_loop_cmd, "osmotrx timing-advance-loop", OSMOTRX_STR "Enable timing advance control loop\n") { - struct phy_link *plink = vty->index; - - plink->u.osmotrx.trx_ta_loop = true; + vty_out (vty, "'osmotrx timing-advance-loop' is deprecated%s", VTY_NEWLINE); return CMD_SUCCESS; } -DEFUN(cfg_phy_no_timing_advance_loop, cfg_phy_no_timing_advance_loop_cmd, +DEFUN_DEPRECATED(cfg_phy_no_timing_advance_loop, cfg_phy_no_timing_advance_loop_cmd, "no osmotrx timing-advance-loop", NO_STR OSMOTRX_STR "Disable timing advance control loop\n") { - struct phy_link *plink = vty->index; - - plink->u.osmotrx.trx_ta_loop = false; + vty_out (vty, "'no osmotrx timing-advance-loop' is deprecated%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -522,8 +518,6 @@ vty_out(vty, " osmotrx ip remote %s%s", plink->u.osmotrx.remote_ip, VTY_NEWLINE); - vty_out(vty, " %sosmotrx timing-advance-loop%s", (plink->u.osmotrx.trx_ta_loop) ? "" : "no ", VTY_NEWLINE); - if (plink->u.osmotrx.base_port_local) vty_out(vty, " osmotrx base-port local %"PRIu16"%s", plink->u.osmotrx.base_port_local, VTY_NEWLINE); diff --git a/tests/Makefile.am b/tests/Makefile.am index 1eb28d6..57687ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = paging cipher agch misc handover tx_power power meas +SUBDIRS = paging cipher agch misc handover tx_power power meas ta_control if ENABLE_SYSMOBTS SUBDIRS += sysmobts diff --git a/tests/ta_control/Makefile.am b/tests/ta_control/Makefile.am new file mode 100644 index 0000000..4c89dd2 --- /dev/null +++ b/tests/ta_control/Makefile.am @@ -0,0 +1,6 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) +LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) +noinst_PROGRAMS = ta_control_test +EXTRA_DIST = ta_control_test.ok +ta_control_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/tests/ta_control/ta_control_test b/tests/ta_control/ta_control_test new file mode 100755 index 0000000..2b055e4 --- /dev/null +++ b/tests/ta_control/ta_control_test Binary files differ diff --git a/tests/ta_control/ta_control_test.c b/tests/ta_control/ta_control_test.c new file mode 100644 index 0000000..fb0d6d4 --- /dev/null +++ b/tests/ta_control/ta_control_test.c @@ -0,0 +1,74 @@ +/* Test cases for tx_control.c Timing Advance Computation */ + +/* (C) 2016 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#include + +#include +#include +#include +#include +#include + +void lchan_ms_ta_ctrl_test(int16_t toa256_start, unsigned int steps) +{ + struct gsm_lchan lchan = {}; + unsigned int i; + uint8_t rqd_ta_after; + uint8_t rqd_ta_before; + int16_t toa256 = toa256_start; + + /* Arbitrary value, high enough so that a computation can happen. */ + lchan.meas.num_ul_meas = 10; + + printf("toa256_start = %u / 256 = %u, steps = %u\n", toa256_start, toa256_start / 256, steps); + + for (i=0; i expout AT_CHECK([$abs_top_builddir/tests/meas/meas_test], [], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([ta_control]) +AT_KEYWORDS([ta_control]) +cat $abs_srcdir/ta_control/ta_control_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/ta_control/ta_control_test], [], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 10:54:10 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 10:54:10 +0000 Subject: Change in libosmocore[master]: logging.c: Add valuestrings for loglevels In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16832 ) Change subject: logging.c: Add valuestrings for loglevels ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81e58dbae9889f1424ff107a22ed0e838bea7f5b Gerrit-Change-Number: 16832 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 10:57:06 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 10:57:06 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16833 to look at the new patch set (#2). Change subject: application.c: check default loglevels on startup ...................................................................... application.c: check default loglevels on startup Default log levels should not be set lower than LOGL_NOTICE. If a lower loglevel is desired, this loglevel should be set via a configuration file. Lets print a warning if a default loglevel lower than LOGL_NOTICE is set to remind the programmer to set proper default loglevels. Related: OS#2577 Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 --- M src/application.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/16833/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 11:02:10 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 11:02:10 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, Pablo Neira Ayuso, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 to look at the new patch set (#3). Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... libmsc: SMS, Avoid premature RP-ACK to MS There was one libmsc commit to openbsc that was thus far missing in osmo-msc. This commit completes the work on delayed response from an ESME. Without this patch, the SMR sends an RP-ACK to the mobile station, and subsequently a DELIVER_SM_REPONSE from the ESME prokokes either a second RP-ACK, or an RP-ERROR; both of which result in "unhandled at this state (IDLE)" from the SMR After this patch, we have two things corrected: 1) RP-ERROR respects Deliver-SM error cause. 2) No more "unhandled as this state" error from the SMR Extract from original commit message: -------- libmsc: annotate esme route in the sms object from deliver_to_esme() Annotate this esme route, so we can use it to return -EINPROGRESS to skip sending premature RP-ACK to the mobile station, in case we're handling sms routes through SMPP. -------- Fixes: #OS4351 Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b --- M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/16873/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 11:04:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 11:04:10 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jan 2020 11:04:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 11:05:14 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 11:05:14 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16873/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16873/2//COMMIT_MSG at 2 PS2, Line 2: Keith Whyte > Please make sure to indicate actual author of the original patch - Pablo Neira Ayuso. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jan 2020 11:05:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 11:27:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 11:27:27 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16833/2/src/application.c File src/application.c: https://gerrit.osmocom.org/c/libosmocore/+/16833/2/src/application.c at 127 PS2, Line 127: printf We shall not log to stdout, because some programs may use it for writing binary data (e.g. osmo-gapk). Better use stderr. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 11:27:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 11:59:58 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 11:59:58 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#10). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 136 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:11:06 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 12:11:06 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16833 to look at the new patch set (#4). Change subject: application.c: check default loglevels on startup ...................................................................... application.c: check default loglevels on startup Default log levels should not be set lower than LOGL_NOTICE. If a lower loglevel is desired, this loglevel should be set via a configuration file. Lets print a warning if a default loglevel lower than LOGL_NOTICE is set to remind the programmer to set proper default loglevels. Related: OS#2577 Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 --- M src/application.c 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/16833/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:11:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 12:11:28 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/16833/1/src/application.c File src/application.c: https://gerrit.osmocom.org/c/libosmocore/+/16833/1/src/application.c at 122 PS1, Line 122: static void check_loglevels(const struct log_info *log_info) > I don't really like forcing this. [?] Hmm. Maybe its a bad idea then to enforce default loglevels at all? See ticket: http://osmocom.org/issues/2577 https://gerrit.osmocom.org/c/libosmocore/+/16833/2/src/application.c File src/application.c: https://gerrit.osmocom.org/c/libosmocore/+/16833/2/src/application.c at 127 PS2, Line 127: printf > We shall not log to stdout, because some programs may use it for writing binary data (e.g. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:23:19 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jan 2020 12:23:19 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... bsc_main: use higher default loglevels. The loglevels of DNM, DFILTER and DPCU are set to low, lets set them all to NOTICE Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Related: OS#2577 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/16886/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 6b14279..66310b3 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -713,7 +713,7 @@ .name = "DNM", .description = "A-bis Network Management / O&M (NM/OML)", .color = "\033[1;36m", - .enabled = 1, .loglevel = LOGL_INFO, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPAG] = { .name = "DPAG", @@ -761,12 +761,12 @@ [DFILTER] = { .name = "DFILTER", .description = "BSC/NAT IMSI based filtering", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPCU] = { .name = "DPCU", .description = "PCU Interface", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DLCLS] = { .name = "DLCLS", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:35:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:35:01 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16877/1/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16877/1/Transceiver52M/device/lms/LMSDevice.cpp at 297 PS1, Line 297: host > host? Yes, that's how LimeSuite calls this sample rate (the one used on the stream between workstation and Lime device). I'm reusing the variable which was already being used later on in LMS_GetSampleRate to show they contain the same information. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:35:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:35:51 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:35:51 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 18: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16258/18/src/dgsm_vty.c File src/dgsm_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/18/src/dgsm_vty.c at 122 PS18, Line 122: "no mdns", Should also be "no mdns bind", I'm preparing a fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 18 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:35:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:39:58 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:39:58 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#19) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 21 files changed, 2,005 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/19 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:40:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:40:37 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h File Transceiver52M/device/lms/LMSDevice.h: https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h at 48 PS1, Line 48: LMS_DEV_UNKNOWN > Maybe rather keep this one first, so it will be 0? I prefer keeping it at the end since it's the "leftover" one, taken if no other is matched. There's not need for it to be 0. https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.h at 70 PS1, Line 70: dev_type > ... [?] We have c++ constructors for that. https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 51 PS1, Line 51: Device Name Prefixes > How about using value_string array here? The value_string similar stuff is already in std::map dev_param_map, in here I'm just listing them in defines to be used later to make sure other people don't start using their own prefix name strings in other places. https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 245 PS1, Line 245: /* FIXME make external reference frequency configurable */ > should we still keep this comment? As far as I can see, you're checking if it's supported now... AFAIU this comment talks about changing the external frequency value, not the sample rate source. See 10000000.0 is hardcoded. https://gerrit.osmocom.org/c/osmo-trx/+/16876/1/Transceiver52M/device/lms/LMSDevice.cpp at 275 PS1, Line 275: else > So if !dev_desc. [?] Makes sense thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 12:40:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:41:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:41:49 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp at 83 PS2, Line 83: 8.9e-5, 8.2e-5 > Is it really the same given that sampling frequency is different? I'm not sure what do you mean here. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:41:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:42:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:42:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 ) Change subject: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 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: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 Gerrit-Change-Number: 16880 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:42:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:42:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:42:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print receive... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 ) Change subject: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 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: I862766ac87715d5ad141405f343f0563fd75150f Gerrit-Change-Number: 16881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:42:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:42:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:42:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 ) Change subject: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 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: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 Gerrit-Change-Number: 16884 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:42:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:44:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:44:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn at 2152 PS3, Line 2152: testcase TC_smpp_mo_sms_rp_error() runs on MTC_CT { Does it make sense to have it for Iu too? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:44:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:45:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:45:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 ) Change subject: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 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: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Gerrit-Change-Number: 16883 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:46:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:46:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update Socket-API + IPL4 upstream tags In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 ) Change subject: deps/Makefile: Update Socket-API + IPL4 upstream tags ...................................................................... Patch Set 1: Code-Review+2 Any specific reason to do so? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 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: I557f1515528ac3a90b34c1fb647d88a1989fea37 Gerrit-Change-Number: 16879 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:46:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:46:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:46:45 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:46:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:47:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:47:37 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:48:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:48:38 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:48:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:52:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:52:08 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16873/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16873/3//COMMIT_MSG at 15 PS3, Line 15: DELIVER_SM_REPONSE from the ESME prokokes either a second provokes? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:52:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:52:11 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:52:11 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:52:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:52:15 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:52:15 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: move from osmo-ci.git In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16867 ) Change subject: debian-stretch-jenkins: move from osmo-ci.git ...................................................................... debian-stretch-jenkins: move from osmo-ci.git Put Dockerfile_osmocom_jenkins.amd64 ("osmocom:deb9_amd64") from osmo-ci.git here and give it a more descriptive name. The image is used to run contrib/jenkins.sh scripts of most Osmocom projects. Move it to here, so we have all docker images in one place. In the future, osmo-ci.git will use more images from docker-playground.git in gerrit verification, such as debian-buster-erlang. Related: OS#4345 Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a --- A debian-stretch-jenkins/Dockerfile A debian-stretch-jenkins/Makefile 2 files changed, 150 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Verified diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile new file mode 100644 index 0000000..92d5bdd --- /dev/null +++ b/debian-stretch-jenkins/Dockerfile @@ -0,0 +1,149 @@ +# Image used to run contrib/jenkins.sh scripts of most Osmocom projects. +# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git. + +ARG DEBIAN_VERSION=stretch +FROM debian:${DEBIAN_VERSION} + +# Make "$DEBIAN_VERSION" available after FROM +# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact +ARG DEBIAN_VERSION + +# Install apt dependencies (keep in alphabetic order) +RUN \ + dpkg --add-architecture i386 && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + asciidoc \ + asciidoc-dblatex \ + autoconf \ + autoconf-archive \ + automake \ + bc \ + bison \ + bzip2 \ + cmake \ + coccinelle \ + cppcheck \ + dahdi-source \ + dblatex \ + dbus \ + debhelper \ + devscripts \ + dh-autoreconf \ + dh-systemd \ + docbook5-xml \ + doxygen \ + flex \ + g++ \ + gawk \ + gcc \ + gcc-arm-none-eabi \ + git \ + git-buildpackage \ + graphviz \ + htop \ + inkscape \ + lcov \ + libaio-dev \ + libasound2-dev \ + libboost-all-dev \ + libc-ares-dev \ + libcsv-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libffi-dev \ + libfftw3-dev \ + libgmp-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + liblua5.3-dev \ + libmnl-dev \ + libncurses5-dev \ + libnewlib-arm-none-eabi \ + liboping-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + libsctp-dev \ + libsigsegv-dev \ + libsnmp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtool \ + libusb-1.0-0-dev \ + libusb-dev \ + libxml2-utils \ + libzmq3-dev \ + locales \ + lua-socket \ + make \ + mscgen \ + ofono \ + openssh-client \ + osc \ + patchelf \ + pkg-config \ + python3 \ + python3-gi \ + python3-mako \ + python3-nwdiag \ + python3-pip \ + python3-pyflakes \ + python3-setuptools \ + python3-usb \ + python3-yaml \ + rsync \ + sdcc \ + sqlite3 \ + stow \ + sudo \ + systemd \ + tcpdump \ + texinfo \ + unzip \ + wget \ + xsltproc + +# Install pip dependencies (keep in alphabetic order) +RUN pip3 install \ + git+https://github.com/podshumok/python-smpplib.git \ + git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ + pydbus \ + pysispm + +# match the outside user +RUN useradd --uid=1000 build +#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build + +RUN mkdir /build +RUN chown build:build /build + +# Install osmo-python-tests +ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit +RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh + +# Set a UTF-8 locale +RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=en_US.UTF-8 +ENV LANG en_US.UTF-8 + +# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) +ARG LIBULFIUS_VER="2.6.4" +ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}" +ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb +ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz +RUN cd /tmp/ulfius && \ + tar -xvf all.tar.gz && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \ + cd ~ && \ + rm -r /tmp/ulfius + +# osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user +RUN chown -R build:build /usr/local diff --git a/debian-stretch-jenkins/Makefile b/debian-stretch-jenkins/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian-stretch-jenkins/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I125ae8a6bcabbd1f485028c79b0abacda0622c3a Gerrit-Change-Number: 16867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:52:19 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:52:24 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 12:52:24 +0000 Subject: Change in docker-playground[master]: debian-buster-erlang: rename user to "build" In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16868 ) Change subject: debian-buster-erlang: rename user to "build" ...................................................................... debian-buster-erlang: rename user to "build" Match username of debian-stretch-jenkins, so we can use the same docker arguments for both images in gerrit-verifications.yml of osmo-ci.git. Related: OS#4345 Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd --- M debian-buster-erlang/Dockerfile 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile index ed20b37..23da345 100644 --- a/debian-buster-erlang/Dockerfile +++ b/debian-buster-erlang/Dockerfile @@ -45,6 +45,6 @@ ADD $OSMOCOM_REPO/Release /tmp/Release # add a non-root user under which we will normaly execute build tests -RUN useradd -m osmocom -WORKDIR /home/osmocom -USER osmocom +RUN useradd -m build +WORKDIR /home/build +USER build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia3eaec6090c9652549b2850de74ee21730374bbd Gerrit-Change-Number: 16868 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 12:53:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 12:53:30 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 19: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 12:53:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 13:49:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 13:49:16 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 27: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16209/27/src/mslookup_server.c File src/mslookup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16209/27/src/mslookup_server.c at 263 PS27, Line 263: } missing "return false", preparing a fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 27 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 13:49:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 13:50:58 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 15 Jan 2020 13:50:58 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#28) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 537 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 13:52:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 13:52:07 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 13:52:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:07:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:07:37 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.20 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16848 ) Change subject: layer23: Fix build against gpsd >= 3.20 ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+2 > > They seem to like breaking API... At least they provide the API_MAJOR define so you can easily check, but yeah. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f Gerrit-Change-Number: 16848 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:07:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:07:40 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.20 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16848 ) Change subject: layer23: Fix build against gpsd >= 3.20 ...................................................................... layer23: Fix build against gpsd >= 3.20 During 3.19->3.20 dev cycle, some fields were transformed from timestamp_t or double to timespec_t. See for instance gpsd.git f7c230fceb6d64483757f8c32afb98e6a2cb9413. Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f --- M src/host/layer23/src/common/gps.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index 35ee416..807beed 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -82,7 +82,11 @@ g.valid = 0; /* gps is offline */ +#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0 + if (gdata->online.tv_sec || gdata->online.tv_nsec) +#else if (gdata->online) +#endif goto gps_not_ready; #if GPSD_API_MAJOR_VERSION >= 5 @@ -102,7 +106,11 @@ /* data are valid */ if (gdata->set & LATLON_SET) { g.valid = 1; +#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0 + g.gmt = gdata->fix.time.tv_sec; +#else g.gmt = gdata->fix.time; +#endif tm = localtime(&g.gmt); diff = time(NULL) - g.gmt; g.latitude = gdata->fix.latitude; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie8ba19d030b6f46f2d8afc270a732ce8c26c438f Gerrit-Change-Number: 16848 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:47:18 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 14:47:18 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, Pablo Neira Ayuso, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 to look at the new patch set (#4). Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... libmsc: SMS, Avoid premature RP-ACK to MS There was one libmsc commit to openbsc that was thus far missing in osmo-msc. This commit completes the work on delayed response from an ESME. Without this patch, the SMR sends an RP-ACK to the mobile station, and subsequently a DELIVER_SM_REPONSE from the ESME provokes either a second RP-ACK, or an RP-ERROR; both of which result in "unhandled at this state (IDLE)" from the SMR After this patch, we have two things corrected: 1) RP-ERROR respects Deliver-SM error cause. 2) No more "unhandled as this state" error from the SMR Extract from original commit message: -------- libmsc: annotate esme route in the sms object from deliver_to_esme() Annotate this esme route, so we can use it to return -EINPROGRESS to skip sending premature RP-ACK to the mobile station, in case we're handling sms routes through SMPP. -------- Fixes: #OS4351 Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b --- M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/16873/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:47:39 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 14:47:39 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16873/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16873/3//COMMIT_MSG at 15 PS3, Line 15: DELIVER_SM_REPONSE from the ESME prokokes either a second > provokes? yep.. getting more blind by the day... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:47:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:47:47 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 14:47:47 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:48:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:48:47 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:48:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:51:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:51:16 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 to look at the new patch set (#2). Change subject: lms: Store device type specific parameters in one place ...................................................................... lms: Store device type specific parameters in one place Add an enum containing each supported device type (LimeSDR-USB, LimeSDR-Mini and LimeNet-Micro) plus "unknown", to leave some room for yet-to-come devices to run with some generic parameters without rebuilding osmo-trx. Each device type is assigned a dev_desc structure, and all of them are put in HashMap, similar to what's already done in UHDDevice.cpp. Device type is infered from string provided by LMS_GetDeviceInfo(), as it was already done before in several places. From now on, we only need to parse the string once since we store the device type after first during open time. Later on, more fields will be moved to device-type specific structure, such as Tx timing offset, clock rate, etc. Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 4 files changed, 119 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/76/16876/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:51:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:51:17 +0000 Subject: Change in osmo-trx[master]: lms: Make reference to std::vector unambiguous References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16887 ) Change subject: lms: Make reference to std::vector unambiguous ...................................................................... lms: Make reference to std::vector unambiguous Change-Id: Ieebdbd3d5082a02aea2441e6737783370511cbc1 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/16887/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index cb0129a..3d2b68e 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -109,7 +109,7 @@ int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args) { unsigned int i, j; - vector filters; + std::vector filters; filters = comma_delimited_to_vector(args.c_str()); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieebdbd3d5082a02aea2441e6737783370511cbc1 Gerrit-Change-Number: 16887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:51:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:51:45 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:51:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:51:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:51:57 +0000 Subject: Change in osmo-msc[master]: Trivial: code simplification, return early In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16839 ) Change subject: Trivial: code simplification, return early ...................................................................... Trivial: code simplification, return early This commit also, (for what it is worth) removes a difference to the same file in openbsc, which I found while looking for changes that affected SMPP delivery. This is essentially a "forward-port" of [1] [1] https://gerrit.osmocom.org/#/c/openbsc/+/3899/ Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e --- M src/libmsc/gsm_04_11.c 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 367cc6f..ae19b27 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -442,29 +442,29 @@ /* determine gsms->receiver based on dialled number */ gsms->receiver = vlr_subscr_find_by_msisdn(net->vlr, gsms->dst.addr, VSUB_USE_SMS_RECEIVER); - if (!gsms->receiver) { -#ifdef BUILD_SMPP - /* Avoid a second look-up */ - if (smpp_route_smpp_first()) { - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); - return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; - } + if (gsms->receiver) + return 0; - rc = smpp_try_deliver(gsms, msc_a); - if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) { - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); - } else if (rc < 0) { - LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc); - rc = GSM411_RP_CAUSE_MO_TEMP_FAIL; - /* rc will be logged by gsm411_send_rp_error() */ - rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]); - } -#else - rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; +#ifdef BUILD_SMPP + /* Avoid a second look-up */ + if (smpp_route_smpp_first()) { rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); + return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + } + + rc = smpp_try_deliver(gsms, msc_a); + if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) { + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); + } else if (rc < 0) { + LOG_TRANS(trans, LOGL_ERROR, "SMS delivery error: %d\n", rc); + rc = GSM411_RP_CAUSE_MO_TEMP_FAIL; + /* rc will be logged by gsm411_send_rp_error() */ + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]); + } +#else + rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]); #endif - } else - rc = 0; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I350c19f5bb70b2656171c096334c2ee83f49df7e Gerrit-Change-Number: 16839 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:51:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:51:59 +0000 Subject: Change in osmo-msc[master]: libmsc: SMS, Avoid premature RP-ACK to MS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16873 ) Change subject: libmsc: SMS, Avoid premature RP-ACK to MS ...................................................................... libmsc: SMS, Avoid premature RP-ACK to MS There was one libmsc commit to openbsc that was thus far missing in osmo-msc. This commit completes the work on delayed response from an ESME. Without this patch, the SMR sends an RP-ACK to the mobile station, and subsequently a DELIVER_SM_REPONSE from the ESME provokes either a second RP-ACK, or an RP-ERROR; both of which result in "unhandled at this state (IDLE)" from the SMR After this patch, we have two things corrected: 1) RP-ERROR respects Deliver-SM error cause. 2) No more "unhandled as this state" error from the SMR Extract from original commit message: -------- libmsc: annotate esme route in the sms object from deliver_to_esme() Annotate this esme route, so we can use it to return -EINPROGRESS to skip sending premature RP-ACK to the mobile station, in case we're handling sms routes through SMPP. -------- Fixes: #OS4351 Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b --- M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: keith: Looks good to me, approved pespin: Looks good to me, approved fixeria: Verified Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index ae19b27..5c26929 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -629,6 +629,10 @@ rc = sms_route_mt_sms(trans, gsms); + /* This SMS got routed through SMPP and we are waiting on the response. */ + if (gsms->smpp.esme) { + return -EINPROGRESS; + } /* * This SMS got routed through SMPP or no receiver exists. * In any case, we store it in the database for further processing. @@ -717,8 +721,10 @@ return gsm411_send_rp_ack(trans, rph->msg_ref); else if (rc > 0) return gsm411_send_rp_error(trans, rph->msg_ref, rc); - else - return rc; + else if (rc == -EINPROGRESS) + rc = 0; + + return rc; } /* Receive a 04.11 RP-DATA message in accordance with Section 7.3.1.2 */ diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 98b3b53..a79b252 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -773,6 +773,10 @@ if (ret < 0) return ret; + OSMO_ASSERT(!sms->smpp.esme); + smpp_esme_get(esme); + sms->smpp.esme = esme; + return smpp_cmd_enqueue(esme, vsub, sms, deliver.sequence_number); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic34d398e0a850856e20380ae35e5c2ae5e3c539b Gerrit-Change-Number: 16873 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:52:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:52:34 +0000 Subject: Change in osmo-trx[master]: lms: Make reference to std::vector unambiguous In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16887 ) Change subject: lms: Make reference to std::vector unambiguous ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieebdbd3d5082a02aea2441e6737783370511cbc1 Gerrit-Change-Number: 16887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jan 2020 14:52:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:52:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:52:56 +0000 Subject: Change in osmo-trx[master]: lms: Move rx_buffers allocation to constructor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16875 ) Change subject: lms: Move rx_buffers allocation to constructor ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 Gerrit-Change-Number: 16875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jan 2020 14:52:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:54:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:54:10 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jan 2020 14:54:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:54:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:54:37 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 1: Waiting for jenkins success before I review it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:54:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:57:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:57:12 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Patch Set 4: Code-Review-1 I think it makes more sense to have that as unit tests rather than every time an app is run... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:57:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:57:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:57:18 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:57:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:57:49 2020 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 15 Jan 2020 14:57:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn at 2152 PS3, Line 2152: testcase TC_smpp_mo_sms_rp_error() runs on MTC_CT { > Does it make sense to have it for Iu too? for LU provoked alert notification? AKAIK There's no SMPP response. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Wed, 15 Jan 2020 14:57:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:58:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 14:58:14 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:58:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 14:58:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 14:58:47 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 14:58:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 15:00:21 +0000 Subject: Change in osmo-trx[master]: lms: Move rx_buffers allocation to constructor In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16875 ) Change subject: lms: Move rx_buffers allocation to constructor ...................................................................... Patch Set 2: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 Gerrit-Change-Number: 16875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 15:00:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:00:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 15:00:28 +0000 Subject: Change in osmo-trx[master]: lms: Make reference to std::vector unambiguous In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16887 ) Change subject: lms: Make reference to std::vector unambiguous ...................................................................... lms: Make reference to std::vector unambiguous Change-Id: Ieebdbd3d5082a02aea2441e6737783370511cbc1 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index cb0129a..3d2b68e 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -109,7 +109,7 @@ int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args) { unsigned int i, j; - vector filters; + std::vector filters; filters = comma_delimited_to_vector(args.c_str()); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieebdbd3d5082a02aea2441e6737783370511cbc1 Gerrit-Change-Number: 16887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:00:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 15:00:28 +0000 Subject: Change in osmo-trx[master]: lms: Move rx_buffers allocation to constructor In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16875 ) Change subject: lms: Move rx_buffers allocation to constructor ...................................................................... lms: Move rx_buffers allocation to constructor Release is done in destructor, so let's move allocation to constructor since there's really no need to have them in open() which is already quite complex and large. Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 3d2b68e..8ad338b 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -58,6 +58,11 @@ tx_gains.resize(chans); rx_buffers.resize(chans); + + /* Set up per-channel Rx timestamp based Ring buffers */ + for (size_t i = 0; i < rx_buffers.size(); i++) + rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); + } LMSDevice::~LMSDevice() @@ -243,10 +248,6 @@ goto out_close; } - /* Set up per-channel Rx timestamp based Ring buffers */ - for (size_t i = 0; i < rx_buffers.size(); i++) - rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); - return NORMAL; out_close: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8a4fd973590c4c165abd8f2837b2da8fc14a2066 Gerrit-Change-Number: 16875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:53:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:53:37 +0000 Subject: Change in libosmo-sccp[master]: ss7: Improve checks in osmo_ss7_asp_peer_add_host() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 ) Change subject: ss7: Improve checks in osmo_ss7_asp_peer_add_host() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf Gerrit-Change-Number: 16831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 15:53:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:53:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:53:41 +0000 Subject: Change in libosmo-sccp[master]: ss7: Improve checks in osmo_ss7_asp_peer_add_host() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 ) Change subject: ss7: Improve checks in osmo_ss7_asp_peer_add_host() ...................................................................... ss7: Improve checks in osmo_ss7_asp_peer_add_host() * Introduce check to make sure we don't write out of peer->host bounds. * Clean up any/specific address checks, it should be more clear now. Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf --- M src/osmo_ss7.c 1 file changed, 17 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 70ec847..b7d69cb 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1149,19 +1149,25 @@ bool new_is_any = !host || !strcmp(host, "0.0.0.0"); bool iter_is_any; - /* Makes no sense to have INET_ANY and specific addresses in the set */ - for (i = 0; i < peer->host_cnt; i++) { - iter_is_any = !peer->host[i] || - !strcmp(peer->host[i], "0.0.0.0"); - if (new_is_any && iter_is_any) - return -EINVAL; - if (!new_is_any && iter_is_any) - return -EINVAL; - } - /* Makes no sense to have INET_ANY many times */ - if (new_is_any && peer->host_cnt) + if (peer->host_cnt >= ARRAY_SIZE(peer->host)) return -EINVAL; + /* Makes no sense to have INET_ANY many times, or INET_ANY together with + specific addresses: */ + if (new_is_any && peer->host_cnt != 0) + return -EINVAL; + + /* Makes no sense to add specific address to set if INET_ANY is + already set: */ + if (!new_is_any) { + for (i = 0; i < peer->host_cnt; i++) { + iter_is_any = !peer->host[i] || + !strcmp(peer->host[i], "0.0.0.0"); + if (iter_is_any) + return -EINVAL; + } + } + osmo_talloc_replace_string(talloc_ctx, &peer->host[peer->host_cnt], host); peer->host_cnt++; return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3ecb94267acbec6ecf2134b08110f24f131cd8cf Gerrit-Change-Number: 16831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:54:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:54:31 +0000 Subject: Change in osmo-ci[master]: OBS: clone from gerrit.osmocom.org In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16561 ) Change subject: OBS: clone from gerrit.osmocom.org ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e Gerrit-Change-Number: 16561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jan 2020 15:54:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:56:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:56:35 +0000 Subject: Change in osmo-bsc[master]: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TE... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16352 ) Change subject: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TEI_DN ...................................................................... Patch Set 2: you need to be careful here. * abis/ip has one common OML link (TCP/IPA connection) and per-TRX RSL * other BTS models (e.g. Ericsson) have per-TRX OML and RSL links (LAPD datalinks) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3dc657ac5a2c5334747bd4f4db1a658acb323942 Gerrit-Change-Number: 16352 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 15:56:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:57:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:57:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 15 Jan 2020 15:57:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:57:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:57:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_gsup_sai_num_auth_vectors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 ) Change subject: hlr: add TC_gsup_sai_num_auth_vectors ...................................................................... hlr: add TC_gsup_sai_num_auth_vectors TC_gsup_sai_num_auth_vectors tests the GSUP IE GSUP_IE_NUM_VECTORS_REQ which allows the client to ask for a specific amount of auth tuples in a Send Auth Info request. Change-Id: I10a523cbaf08fe42924ffd0dc498496fdc76395f --- M hlr/HLR_Tests.ttcn 1 file changed, 61 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 50109a6..4caa88e 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -50,6 +50,9 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_gsup_port := 4222; integer mp_hlr_ctrl_port := 4259; + /* how many auth tuples are expected + when IE ts_GSUP_IE_NUM_VECTORS_REQ is absent */ + integer mp_default_num_auth_tuples := 5; }; type record HlrSubscrAud2G { @@ -395,8 +398,9 @@ /* perform SendAuthInfo for given imsi, return the GSUP response/error */ function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit, - boolean is_eps := false) + boolean is_eps := false, template (omit) integer num_auth_tuple := omit) runs on HLR_ConnHdlr return GSUP_PDU { + var template GSUP_PDU sai_msg; var GSUP_PDU ret; timer T := 3.0; var boolean exp_fail := false; @@ -405,10 +409,17 @@ } if (is_eps) { - GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); + sai_msg := ts_GSUP_SAI_REQ_EPS(imsi); } else { - GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); + sai_msg := ts_GSUP_SAI_REQ(imsi); } + if (not istemplatekind(num_auth_tuple, "omit")) { + sai_msg.ies := valueof(sai_msg.ies) & { + valueof(ts_GSUP_IE_NUM_VECTORS_REQ(int2oct(valueof(num_auth_tuple), 1))) + }; + } + GSUP.send(sai_msg); + T.start; alt { [exp_fail] GSUP.receive(tr_GSUP_SAI_ERR(imsi, exp_err_cause)) -> value ret { @@ -714,7 +725,8 @@ if (ispresent(g_pars.sub.aud3g)) { f_ensure_amf_separation_bit(res, '0'B); } - /* TODO: match if tuple[s] matches expectation */ + + f_count_auth_tuples(res, mp_default_num_auth_tuples); setverdict(pass); } testcase TC_gsup_sai() runs on test_CT { @@ -729,6 +741,31 @@ setverdict(pass); } +/* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ +private function f_TC_gsup_sai_num_auth_vectors() runs on HLR_ConnHdlr { + var GSUP_PDU res; + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 1); + f_count_auth_tuples(res, 1); + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 4); + f_count_auth_tuples(res, 4); + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 5); + f_count_auth_tuples(res, 5); + res := f_perform_SAI(g_pars.sub.imsi, num_auth_tuple := 254); + f_count_auth_tuples(res, 5); + setverdict(pass); +} +testcase TC_gsup_sai_num_auth_vectors() runs on test_CT { + var HlrSubscriberList sl; + var GSUP_PDU res; + + f_init(false); + + sl := f_gen_subs(); + f_start_handler_per_sub(refers(f_TC_gsup_sai_num_auth_vectors), sl); + + setverdict(pass); +} + private function f_ensure_amf_separation_bit(GSUP_PDU res, BIT1 sep_bit) { for (var integer i := 0; i < lengthof(res.ies); i := i+1) { @@ -749,6 +786,25 @@ } } +private function f_count_auth_tuples(GSUP_PDU res, template (omit) integer expected_auth_tuples := omit) +{ + var integer auth_tuples := 0; + for (var integer i := 0; i < lengthof(res.ies); i := i+1) { + var GSUP_IE tuple := res.ies[i]; + if (tuple.tag == OSMO_GSUP_AUTH_TUPLE_IE) { + auth_tuples := auth_tuples + 1; + } + } + + if ((not istemplatekind(expected_auth_tuples, "omit")) and + not match(auth_tuples, valueof(expected_auth_tuples))) { + setverdict(fail, + "Did not received expected number of auth tuples. Expected ", + mp_default_num_auth_tuples, + " but received ", auth_tuples); + } +} + /* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ private function f_TC_gsup_sai_eps() runs on HLR_ConnHdlr { var GSUP_PDU res; @@ -1471,6 +1527,7 @@ control { execute( TC_gsup_sai_err_invalid_imsi() ); execute( TC_gsup_sai() ); + execute( TC_gsup_sai_num_auth_vectors() ); execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16790 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: I10a523cbaf08fe42924ffd0dc498496fdc76395f Gerrit-Change-Number: 16790 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 15:58:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 15:58:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update Socket-API + IPL4 upstream tags In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 ) Change subject: deps/Makefile: Update Socket-API + IPL4 upstream tags ...................................................................... deps/Makefile: Update Socket-API + IPL4 upstream tags Change-Id: I557f1515528ac3a90b34c1fb647d88a1989fea37 --- M deps/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index 012b925..043aaa3 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -108,11 +108,11 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-5-g86b7d7f +titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.GPIO_commit= R.2.A-8-g9728492 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -titan.TestPorts.IPL4asp_commit= R.30.C-3-g24f0681 +titan.TestPorts.IPL4asp_commit= R.30.E titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265 titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16879 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: I557f1515528ac3a90b34c1fb647d88a1989fea37 Gerrit-Change-Number: 16879 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:00:44 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:04:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:04:36 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Patch Set 4: Code-Review-1 I would think it's sufficient to go through all applications (it's not that many, after all) and ensure that the current code doesn't have any compiled-in default log level below NOTICE or INFO. In the future we should pay attention during code review to prevent new such bugs from being introduced. I would expect they date back to our pre-gerrit development days. This way thre's no need for enforcement in libosmocore, which may create problems as pau indicates. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:06:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:06:09 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:06:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:06:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:06:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 ) Change subject: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 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: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Gerrit-Change-Number: 16883 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:06:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:07:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:07:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 ) Change subject: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 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: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 Gerrit-Change-Number: 16880 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:07:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:07:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:07:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print receive... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 ) Change subject: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 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: I862766ac87715d5ad141405f343f0563fd75150f Gerrit-Change-Number: 16881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:07:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:07:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 ) Change subject: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 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: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 Gerrit-Change-Number: 16884 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Wed, 15 Jan 2020 16:08:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 ) Change subject: MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() ...................................................................... MSC: fix coding style in f_tc_lu_and_mt_sms_paging_and_nothing() Change-Id: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 --- M msc/MSC_Tests.ttcn 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index bf7f748..5a23916 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2008,21 +2008,20 @@ timer T := 20.0; T.start alt { - [pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) - { - setverdict(fail, "paging seems not to stop!"); - mtc.stop; + [pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; } - [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { - setverdict(fail, "paging seems not to stop!"); - mtc.stop; + [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; } - [] BSSAP.receive { - setverdict(fail, "unexpected BSSAP message received"); - self.stop; + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; } - [] T.timeout { - setverdict(pass); + [] T.timeout { + setverdict(pass); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16880 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: Ide647f62150b2ca64e12044ae8dae5bb33e600c2 Gerrit-Change-Number: 16880 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print receive... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 ) Change subject: MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU ...................................................................... MSC/SMS-over-GSUP: cosmetic: use a single log() call to print received PDU Change-Id: I862766ac87715d5ad141405f343f0563fd75150f --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 5a23916..13cb8f4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2208,8 +2208,7 @@ f_mo_sms_submit(spars); alt { [] GSUP.receive(mo_forwardSM) -> value gsup_msg_rx { - log("RX MO-forwardSM-Req"); - log(gsup_msg_rx); + log("RX MO-forwardSM-Req: ", gsup_msg_rx); setverdict(pass); } [] GSUP.receive { @@ -2265,8 +2264,7 @@ f_mo_smma(spars); alt { [] GSUP.receive(mo_ReadyForSM) -> value gsup_msg_rx { - log("RX MO-ReadyForSM-Req"); - log(gsup_msg_rx); + log("RX MO-ReadyForSM-Req: ", gsup_msg_rx); setverdict(pass); } [] GSUP.receive { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16881 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: I862766ac87715d5ad141405f343f0563fd75150f Gerrit-Change-Number: 16881 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 ) Change subject: library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT ...................................................................... library/L3_Templates.ttcn: fix length matching in tr_RP_ERROR_MT Change-Id: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 --- M library/L3_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 6b5f5c2..cf7b9d9 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2996,7 +2996,7 @@ rP_Spare := '00000'B, rP_Message_Reference := msg_ref, rP_CauseLV := { - rP_LengthIndicator := 0, /* overwritten */ + rP_LengthIndicator := ?, rP_CauseV := { causeValue := f_cause_or_wc(cause), ext := '0'B -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16884 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: Id5a4210a9f256f8bd7b0048fd65610de8c378bb9 Gerrit-Change-Number: 16884 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 This test case reproduces the problem described in OS#4351: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. MSC prematurely responds with RP-ACK to the MS/UE; 3. ESME responds with DELIVER-SM error; 4. SMS transaction is already terminated (by RP-ACK). Expected behaviour: 1. MS/UE submits a MO SMS which it getting touted to an ESME; 2. ESME responds with DELIVER-SM error; 3. MSC terminates the SMS transaction with RP-ERROR. Change-Id: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Related: OS#4351 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 46 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 13cb8f4..94fac74 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2160,6 +2160,50 @@ f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); } +/* Test case for OS#4351: make sure that RP-ERROR from ESME is properly sent to the MS/UE */ +friend function f_tc_smpp_mo_sms_rp_error(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var SMPP_PDU smpp_pdu; + timer T := 3.0; + + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + /* MS/UE submits a MO SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + f_mo_sms_submit(spars); + + /* ESME responds with an error (Invalid Destination Address) */ + T.start; + alt { + [] SMPP.receive(tr_SMPP(c_SMPP_command_id_deliver_sm, ESME_ROK, body := ?)) -> value smpp_pdu { + SMPP.send(ts_SMPP_DELIVER_SM_resp(ESME_RINVDSTADR, smpp_pdu.header.seq_num)); + } + [] SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)) { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for SMPP DELIVER-SM"); + mtc.stop; + } + } + + /* Expect RP-ERROR on BSSAP interface */ + spars.exp_rp_err := 1; /* FIXME: GSM411_RP_CAUSE_MO_NUM_UNASSIGNED */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_smpp_mo_sms_rp_error() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "default-route"); + vc_conn := f_start_handler(refers(f_tc_smpp_mo_sms_rp_error), 45); + vc_conn.done; + f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); +} + /* Test MO-SMS from MS/BTS/BSC towards HLR (via GSUP) */ friend function f_tc_gsup_mo_sms(charstring id, BSC_ConnHdlrPars pars) @@ -5904,6 +5948,7 @@ execute( TC_lu_and_mt_sms_paging_and_nothing() ); execute( TC_lu_and_mt_sms_paging_repeated() ); execute( TC_smpp_mo_sms() ); + execute( TC_smpp_mo_sms_rp_error() ); execute( TC_smpp_mt_sms() ); execute( TC_gsup_mo_sms() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index e2cca45..68e2958 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -55,6 +55,7 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:08:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 16:08:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 ) Change subject: MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms ...................................................................... MSC/SMPP: fix RP-ACK expectations in TC_smpp_mo_sms The MSC shall not send RP-ACK before the response from ESME. Change-Id: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Related: OS#4351 --- M msc/MSC_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 94fac74..ccfc154 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2109,9 +2109,10 @@ /* Perform location update so IMSI is known + registered in MSC/VLR */ f_perform_lu(); - f_establish_fully(EST_TYPE_MO_SMS); - f_mo_sms(spars); + /* MS/UE submits a MO SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + f_mo_sms_submit(spars); var SMPP_PDU smpp; var template SMPP_PDU tr_smpp := tr_SMPP(c_SMPP_command_id_deliver_sm, ESME_ROK); @@ -2149,6 +2150,9 @@ [] SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK)) { repeat; } } + /* MSC terminates the SMS transaction with RP-ACK */ + f_mo_sms_wait_rp_ack(spars); + f_expect_clear(); } testcase TC_smpp_mo_sms() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16883 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: Ide1376cae8e75412039b7dc9f0b8bb390eab2280 Gerrit-Change-Number: 16883 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:11:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 16:11:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 ) Change subject: MSC/SMPP: introduce TC_smpp_mo_sms_rp_error for OS#4351 ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882/3/msc/MSC_Tests.ttcn at 2152 PS3, Line 2152: testcase TC_smpp_mo_sms_rp_error() runs on MTC_CT { > Does it make sense to have it for Iu too? This is not something RAT specific, so we can add it later. Not critical. > for LU provoked alert notification? AKAIK There's no SMPP response. AFAIR, yes, no response. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16882 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: I33c6ea0ffdf8b8a45f587d690bdceb38fc42c898 Gerrit-Change-Number: 16882 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: keith Gerrit-Comment-Date: Wed, 15 Jan 2020 16:11:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:16:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 16:16:56 +0000 Subject: Change in osmo-bsc[master]: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TE... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16352 ) Change subject: fix inp_sig_cb(): notify all timeslots of all TRXes on OML S_L_INP_TEI_DN ...................................................................... Patch Set 2: > Patch Set 2: > > you need to be careful here. > * abis/ip has one common OML link (TCP/IPA connection) and per-TRX RSL > * other BTS models (e.g. Ericsson) have per-TRX OML and RSL links (LAPD datalinks) Let's keep it WIP for now then. There must be somebody (Neels?) who knows the code base better. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3dc657ac5a2c5334747bd4f4db1a658acb323942 Gerrit-Change-Number: 16352 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:16:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 16:24:04 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16878/2/Transceiver52M/device/lms/LMSDevice.cpp at 83 PS2, Line 83: 8.9e-5, 8.2e-5 > I'm not sure what do you mean here. Ah, nevermind. I failed to see the difference between 8.9e-5 and 8.2e-5. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:24:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 16:35:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 16:35:45 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 10: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c at 647 PS10, Line 647: char cosmetic: const char ... https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c at 742 PS10, Line 742: true false? does not make sense otherwise... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:35:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 17:26:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 17:26:54 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16888 ) Change subject: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() ...................................................................... pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() Passing NULL to strlen() would lead to a segmentation fault. Change-Id: I838e3a21a3b25c2bc8260f67d156c6cc284f4456 Fixes: CID#207484 --- M src/pcu_l1_if.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/16888/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 1f23c25..98b8028 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -66,9 +66,10 @@ uint16_t imsi2paging_group(const char* imsi) { uint16_t pgroup = 0; - size_t len = strlen(imsi); + size_t len; - if (!imsi || len < PAGING_GROUP_LEN) + len = (imsi != NULL) ? strlen(imsi) : 0; + if (len < PAGING_GROUP_LEN) return 0xFFFF; imsi += len - PAGING_GROUP_LEN; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I838e3a21a3b25c2bc8260f67d156c6cc284f4456 Gerrit-Change-Number: 16888 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 17:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jan 2020 17:29:15 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16888 ) Change subject: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I838e3a21a3b25c2bc8260f67d156c6cc284f4456 Gerrit-Change-Number: 16888 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jan 2020 17:29:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 17:31:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jan 2020 17:31:09 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16888 ) Change subject: pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() ...................................................................... pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() Passing NULL to strlen() would lead to a segmentation fault. Change-Id: I838e3a21a3b25c2bc8260f67d156c6cc284f4456 Fixes: CID#207484 --- M src/pcu_l1_if.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 1f23c25..98b8028 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -66,9 +66,10 @@ uint16_t imsi2paging_group(const char* imsi) { uint16_t pgroup = 0; - size_t len = strlen(imsi); + size_t len; - if (!imsi || len < PAGING_GROUP_LEN) + len = (imsi != NULL) ? strlen(imsi) : 0; + if (len < PAGING_GROUP_LEN) return 0xFFFF; imsi += len - PAGING_GROUP_LEN; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I838e3a21a3b25c2bc8260f67d156c6cc284f4456 Gerrit-Change-Number: 16888 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 22:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 22:31:29 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 22:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 15 22:31:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jan 2020 22:31:33 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 22:31:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 06:37:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jan 2020 06:37:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 ) Change subject: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() ...................................................................... MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() It does not make sense to expect Authentication procedure for an unknown IMSI. For GERAN tests authentication is disabled by default, so that's why TC_cmserv_imsi_unknown passess. Change-Id: I26fe18093e49bc9f53ac0234338c2b5cf9e4f07c --- M msc/MSC_Tests.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/16889/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index ccfc154..04ea386 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -638,7 +638,6 @@ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ f_cl3_or_initial_ue(l3_info); - f_mm_auth(); timer T := 10.0; T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 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: I26fe18093e49bc9f53ac0234338c2b5cf9e4f07c Gerrit-Change-Number: 16889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 09:21:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jan 2020 09:21:54 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 2: Code-Review-1 (2 comments) CR-1 because of maxTxGainClamp. https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp at a215 PS2, Line 215: maxTxGainClamp = 73.0; So you move this parameter to dev_param_map, but the old code may still be using maxTxGainClamp. Am I missing something? https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp at 417 PS2, Line 417: if (dev_desc.clock_src_switchable) I would move this check before the switch and return early if !dev_desc.clock_src_switchable. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 09:21:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 10:14:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 10:14:24 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#11). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 136 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 10:34:55 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 10:34:55 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 to look at the new patch set (#2). Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 766 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/16885/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 11:13:25 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 11:13:25 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#12). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 133 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:01:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 12:01:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 ) Change subject: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 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: I26fe18093e49bc9f53ac0234338c2b5cf9e4f07c Gerrit-Change-Number: 16889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:03:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 12:03:31 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp at a215 PS2, Line 215: maxTxGainClamp = 73.0; > So you move this parameter to dev_param_map, but the old code may still be using maxTxGainClamp. [?] Which old code? I don't understand. Its use is dropped in: double LMSDevice::maxTxGain() { return dev_param_map.at(m_dev_type).max_tx_gain; } see line 386. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:03:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:15:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 12:15:50 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 2: Code-Review-1 (6 comments) You are adding binary file tests/ta_control/ta_control_test. Make sure to remove it and add an entry in gitignore. https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/include/osmo-bts/ta_control.h File include/osmo-bts/ta_control.h: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/include/osmo-bts/ta_control.h at 3 PS2, Line 3: #include This header here is not needed at all. If upon removing it compilation fails, then the issue is somewhere else and you should fix it in a previous separate commit. https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/common/ta_control.c at 42 PS2, Line 42: } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { would be nice having this 63 in some define. https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c at 196 PS2, Line 196: vty_out (vty, "'no osmotrx timing-advance-loop' is deprecated%s", VTY_NEWLINE); I'd add some string telling the user that no extra operation is needed, TA loop will be enabled by default? https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c File tests/ta_control/ta_control_test.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c at 43 PS2, Line 43: for (i=0; i Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:15:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:25:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 12:25:21 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 12: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/include/osmo-bts/gsm_data_shared.h at 482 PS12, Line 482: /* We are capable to use two different sources to receive measurement data It's not clear in here which method is available if the feature is set... I'm sure this text can be shrunk a lot too. https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/src/osmo-bts-trx/scheduler_trx.c at 346 PS12, Line 346: int32_t *toa256_sum = &chan_state->toa256_sum; IMHO these pointers are not needed and make code more complex with no good reason. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:25:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:33:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jan 2020 12:33:03 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16876/2/Transceiver52M/device/lms/LMSDevice.cpp at a215 PS2, Line 215: maxTxGainClamp = 73.0; > Which old code? I don't understand. Its use is dropped in: [?] Oops, I see now. Sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:33:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 12:50:17 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 12:50:17 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 to look at the new patch set (#3). Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M .gitignore M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 773 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/16885/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:09:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:09:36 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... Patch Set 2: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 13:09:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:09:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:09:40 +0000 Subject: Change in osmo-trx[master]: lms: Store device type specific parameters in one place In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16876 ) Change subject: lms: Store device type specific parameters in one place ...................................................................... lms: Store device type specific parameters in one place Add an enum containing each supported device type (LimeSDR-USB, LimeSDR-Mini and LimeNet-Micro) plus "unknown", to leave some room for yet-to-come devices to run with some generic parameters without rebuilding osmo-trx. Each device type is assigned a dev_desc structure, and all of them are put in HashMap, similar to what's already done in UHDDevice.cpp. Device type is infered from string provided by LMS_GetDeviceInfo(), as it was already done before in several places. From now on, we only need to parse the string once since we store the device type after first during open time. Later on, more fields will be moved to device-type specific structure, such as Tx timing offset, clock rate, etc. Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 --- M CommonLibs/trx_vty.c M CommonLibs/trx_vty.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 4 files changed, 119 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 44e1d31..3f875f5 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -42,7 +42,7 @@ static struct trx_ctx* g_trx_ctx; -static const struct value_string clock_ref_names[] = { +const struct value_string clock_ref_names[] = { { REF_INTERNAL, "internal" }, { REF_EXTERNAL, "external" }, { REF_GPS, "gpsdo" }, diff --git a/CommonLibs/trx_vty.h b/CommonLibs/trx_vty.h index d20dd96..c0d54cf 100644 --- a/CommonLibs/trx_vty.h +++ b/CommonLibs/trx_vty.h @@ -5,6 +5,7 @@ #include "config_defs.h" extern struct vty_app_info g_vty_info; +extern const struct value_string clock_ref_names[]; extern const struct value_string filler_names[]; /* Maximum number of physical RF channels */ diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 8ad338b..1ef7728 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -20,6 +20,10 @@ #include #include #include + +#include + +#include "trx_vty.h" #include "Logger.h" #include "Threads.h" #include "LMSDevice.h" @@ -44,11 +48,61 @@ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) #define SAMPLE_BUF_SZ (1 << 20) /* Size of Rx timestamp based Ring buffer, in bytes */ + +/* Device Name Prefixes as presented by LimeSuite API LMS_GetDeviceInfo(): */ +#define LMS_DEV_SDR_USB_PREFIX_NAME "LimeSDR-USB" +#define LMS_DEV_SDR_MINI_PREFIX_NAME "LimeSDR-Mini" +#define LMS_DEV_NET_MICRO_PREFIX_NAME "LimeNET-Micro" + +/* Device parameter descriptor */ +struct dev_desc { + /* Does LimeSuite allow switching the clock source for this device? + * LimeSDR-Mini does not have switches but needs soldering to select + * external/internal clock. Any call to LMS_SetClockFreq() will fail. + */ + bool clock_src_switchable; + /* Does LimeSuite allow using REF_INTERNAL for this device? + * LimeNET-Micro does not like selecting internal clock + */ + bool clock_src_int_usable; + /* Device specific maximum tx levels selected by phasenoise measurements, in dB */ + double max_tx_gain; + /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ + std::string name_prefix; +}; + +static const std::map dev_param_map { + { LMS_DEV_SDR_USB, { true, true, 73.0, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, "UNKNOWN" } }, +}; + +static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) +{ + std::map::const_iterator it = dev_param_map.begin(); + + const lms_dev_info_t* device_info = LMS_GetDeviceInfo(m_lms_dev); + + while (it != dev_param_map.end()) + { + enum lms_dev_type dev_type = it->first; + struct dev_desc desc = it->second; + + if (strncmp(device_info->deviceName, desc.name_prefix.c_str(), desc.name_prefix.length()) == 0) { + LOGC(DDEV, INFO) << "Device identified as " << desc.name_prefix; + return dev_type; + } + it++; + } + return LMS_DEV_UNKNOWN; +} + LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), - m_lms_dev(NULL), started(false) + m_lms_dev(NULL), started(false), m_dev_type(LMS_DEV_UNKNOWN) { LOGC(DDEV, INFO) << "creating LMS device..."; @@ -138,11 +192,11 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels) { lms_info_str_t* info_list; - const lms_dev_info_t* device_info; lms_range_t range_sr; float_type sr_host, sr_rf; unsigned int i, n; int rc, dev_id; + struct dev_desc dev_desc; LOGC(DDEV, INFO) << "Opening LMS device.."; @@ -179,19 +233,20 @@ delete [] info_list; - device_info = LMS_GetDeviceInfo(m_lms_dev); + m_dev_type = parse_dev_type(m_lms_dev); + dev_desc = dev_param_map.at(m_dev_type); if ((ref != REF_EXTERNAL) && (ref != REF_INTERNAL)){ LOGC(DDEV, ERROR) << "Invalid reference type"; goto out_close; } - /* if reference clock is external setup must happen _before_ calling LMS_Init */ - /* FIXME make external reference frequency configurable */ + /* if reference clock is external, setup must happen _before_ calling LMS_Init */ if (ref == REF_EXTERNAL) { LOGC(DDEV, INFO) << "Setting External clock reference to 10MHz"; - /* Assume an external 10 MHz reference clock */ - if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0) + /* FIXME: Assume an external 10 MHz reference clock. make + external reference frequency configurable */ + if (!do_clock_src_freq(REF_EXTERNAL, 10000000.0)) goto out_close; } @@ -201,22 +256,13 @@ goto out_close; } - /* LimeSDR-Mini does not have switches but needs soldering to select external/internal clock */ - /* LimeNET-Micro also does not like selecting internal clock*/ - /* also set device specific maximum tx levels selected by phasenoise measurements*/ - if (strncmp(device_info->deviceName,"LimeSDR-USB",11) == 0){ - /* if reference clock is internal setup must happen _after_ calling LMS_Init */ - /* according to lms using LMS_CLOCK_EXTREF with a frequency <= 0 is the correct way to set clock to internal reference*/ - if (ref == REF_INTERNAL) { - LOGC(DDEV, INFO) << "Setting Internal clock reference"; - if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, -1) < 0) - goto out_close; - } - maxTxGainClamp = 73.0; - } else if (strncmp(device_info->deviceName,"LimeSDR-Mini",12) == 0) - maxTxGainClamp = 66.0; - else - maxTxGainClamp = 71.0; /* "LimeNET-Micro", etc FIXME pciE based LMS boards?*/ + /* if reference clock is internal, setup must happen _after_ calling LMS_Init */ + if (ref == REF_INTERNAL) { + LOGC(DDEV, INFO) << "Setting Internal clock reference"; + /* Internal freq param is not used */ + if (!do_clock_src_freq(REF_INTERNAL, 0)) + goto out_close; + } /* enable all used channels */ for (i=0; i tx_gains, rx_gains; - double maxTxGainClamp; + + enum lms_dev_type m_dev_type; bool do_calib(size_t chan); bool do_filters(size_t chan); @@ -68,6 +76,7 @@ bool flush_recv(size_t num_pkts); void update_stream_stats_rx(size_t chan, bool *overrun); void update_stream_stats_tx(size_t chan, bool *underrun); + bool do_clock_src_freq(enum ReferenceType ref, double freq); public: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7658615787c5bc41c365bab9c11733b701ac2ae5 Gerrit-Change-Number: 16876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:09:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:09:40 +0000 Subject: Change in osmo-trx[master]: lms: Make ts_offset and smpl rate coefs device-specific In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16877 ) Change subject: lms: Make ts_offset and smpl rate coefs device-specific ...................................................................... lms: Make ts_offset and smpl rate coefs device-specific Right now the values are the same for all devices, but they will differ in forthcoming commits once multi-arfcn support is added. Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 1ef7728..5a5fbe4 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -67,15 +67,19 @@ bool clock_src_int_usable; /* Device specific maximum tx levels selected by phasenoise measurements, in dB */ double max_tx_gain; + /* Sample rate coef (without having TX/RX samples per symbol into account) */ + double rate; + /* Coefficient multiplied by TX sample rate in order to shift Tx time */ + double ts_offset_coef; /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ std::string name_prefix; }; static const std::map dev_param_map { - { LMS_DEV_SDR_USB, { true, true, 73.0, LMS_DEV_SDR_USB_PREFIX_NAME } }, - { LMS_DEV_SDR_MINI, { false, true, 66.0, LMS_DEV_SDR_MINI_PREFIX_NAME } }, - { LMS_DEV_NET_MICRO, { true, false, 71.0, LMS_DEV_NET_MICRO_PREFIX_NAME } }, - { LMS_DEV_UNKNOWN, { true, true, 73.0, "UNKNOWN" } }, + { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, 8.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, 8.9e-5, "UNKNOWN" } }, }; static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) @@ -277,16 +281,16 @@ goto out_close; print_range("Sample Rate", &range_sr); - LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; - if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0) + sr_host = dev_desc.rate * tx_sps; + LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps; + if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0) goto out_close; if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf)) goto out_close; LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; - /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */ - ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */ + ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); /* configure antennas */ if (!set_antennas()) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 Gerrit-Change-Number: 16877 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:09:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:09:41 +0000 Subject: Change in osmo-trx[master]: lms: Initial multi-arfcn support In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16878 ) Change subject: lms: Initial multi-arfcn support ...................................................................... lms: Initial multi-arfcn support With current state multi-arfcn can be used (eg. I can place a call between 2 phones using TRX1 and sustain for as long as wanted), but from time to time (around every 20seconds), a burst of Tx packed dropped events from LimeSuite appears. LimeNet-micro coefficients have yet not been tested. Related: OS#4362 Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 17 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 5a5fbe4..884cc28 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -69,17 +69,21 @@ double max_tx_gain; /* Sample rate coef (without having TX/RX samples per symbol into account) */ double rate; + /* Sample rate coef (without having TX/RX samples per symbol into account), if multi-arfcn is enabled */ + double rate_multiarfcn; /* Coefficient multiplied by TX sample rate in order to shift Tx time */ double ts_offset_coef; + /* Coefficient multiplied by TX sample rate in order to shift Tx time, if multi-arfcn is enabled */ + double ts_offset_coef_multiarfcn; /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */ std::string name_prefix; }; static const std::map dev_param_map { - { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, - { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, - { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, 8.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, - { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, 8.9e-5, "UNKNOWN" } }, + { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } }, + { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 8.2e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } }, + { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } }, + { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, MCBTS_SPACING, 8.9e-5, 7.9e-5, "UNKNOWN" } }, }; static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev) @@ -281,7 +285,10 @@ goto out_close; print_range("Sample Rate", &range_sr); - sr_host = dev_desc.rate * tx_sps; + if (iface == MULTI_ARFCN) + sr_host = dev_desc.rate_multiarfcn * tx_sps; + else + sr_host = dev_desc.rate * tx_sps; LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps; if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0) goto out_close; @@ -290,7 +297,10 @@ goto out_close; LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; - ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); + if (iface == MULTI_ARFCN) + ts_offset = static_cast(dev_desc.ts_offset_coef_multiarfcn * sr_host); + else + ts_offset = static_cast(dev_desc.ts_offset_coef * sr_host); /* configure antennas */ if (!set_antennas()) { @@ -298,7 +308,7 @@ goto out_close; } - return NORMAL; + return iface == MULTI_ARFCN ? MULTI_ARFCN : NORMAL; out_close: LOGC(DDEV, FATAL) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e67d90a8126546eeeeba376f816ec5d158d4712 Gerrit-Change-Number: 16878 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:27:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:27:04 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16890 ) Change subject: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master ...................................................................... ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master Change-Id: I6b19e50f65bca6fe556c748f3c2b633f65037dce --- M ttcn3-stp-test/Dockerfile 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/16890/1 diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index a755c94..e6bb9d0 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -11,9 +11,7 @@ RUN git config --global user.email docker at dock.er && \ git config --global user.name "Dock Er" -# FIXME: Once STP patches in laforge/stp are merged into master, then -# OSMO_TTCN3_BRANCH can be set again to "master". -ARG OSMO_TTCN3_BRANCH="laforge/stp" +ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit RUN cd osmo-ttcn3-hacks && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6b19e50f65bca6fe556c748f3c2b633f65037dce Gerrit-Change-Number: 16890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:50:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 13:50:21 +0000 Subject: Change in docker-playground[master]: README.md: Document how to get gdb backtrace from process crash References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16891 ) Change subject: README.md: Document how to get gdb backtrace from process crash ...................................................................... README.md: Document how to get gdb backtrace from process crash Change-Id: I507707a3ed0e7f88bcc9006612df531c848b949e --- M README.md 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/16891/1 diff --git a/README.md b/README.md index 05ee31f..479e045 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,43 @@ decided to scrap the file, and just keep the short list of dependencies right above where they would be needed in the `jenkins.sh`. +## Obtaining gdb backtrace from crash + +If for instance TTCN3 test is producing a crash on a program running in docker, +eg. osmo-msc, it is desirable to get a full crash report. This section describes +how to do so. + +First, open `osmo-$program/Dockerfile` and add lines to install `gdb` plus +`$program` dependency debug packages. For instance: + +``` ++RUN apt-get install -y --no-install-recommends \ ++ gdb \ ++ libosmocore-dbg libosmo-abis-dbg libosmo-netif-dbg libosmo-sigtran-dbg osmo-msc-dbg && \ ++ apt-get clean +``` + +In same `Dockerfile` file, modify configure to build with debug symbols enabled +and other interesting options, such as `--enable-sanitize`: + +``` +- ./configure --enable-smpp --enable-iu && \ ++ export CPPFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ export CFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ export CXXFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ ./configure --enable-smpp --enable-iu --enable-sanitize && \ +``` + +Finally open the script you use to run the program (for instance +`ttcn3-$program-master/jenkins.sh`), and modify it to launch the process using +gdb, and to print a full backtrace when control returns to gdb (when the process +crashes): + +``` +-/bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" ++/bin/sh -c "gdb -ex 'run' -ex 'bt full' --arg osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" +``` + ## See also * [Overhyped Docker](http://laforge.gnumonks.org/blog/20170503-docker-overhyped/) for related rambling on why this doesn't work as well as one would -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I507707a3ed0e7f88bcc9006612df531c848b949e Gerrit-Change-Number: 16891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:59:22 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 13:59:22 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 13:59:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 13:59:26 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 13:59:26 +0000 Subject: Change in osmo-ci[master]: docker_images_require: add symlink code path In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 ) Change subject: docker_images_require: add symlink code path ...................................................................... docker_images_require: add symlink code path Make development easier by skipping fetch, checkout and reset --hard if _docker_playground is a symlink. Document _docker_playground in README.adoc and explain how to set up the symlink. Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 --- M README.adoc M scripts/common.sh 2 files changed, 27 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/README.adoc b/README.adoc index aa45b58..786be0d 100644 --- a/README.adoc +++ b/README.adoc @@ -12,3 +12,14 @@ scripts: used by jenkins jobs. Various osmo*/contrib/jenkins.sh scripts assume osmo-ci to be checked out in the build slave user's home, i.e. using a PATH of $HOME/osmo-ci/scripts. + +_docker_playground: Clone of docker-playground.git, so the scripts can build +required docker images. This dir gets created on demand by scripts/common.sh, +and automatically fetched and reset to "origin/master" (override with +$OSMO_BRANCH_DOCKER_PLAYGROUND). The fetch and reset gets skipped if +_docker_playground is a symlink. For development, set it up as follows: + + $ git clone https://git.osmocom.org/docker-playground + $ git clone https://git.osmocom.org/osmo-ci + $ cd osmo-ci + $ ln -s ../docker-playground _docker_playground diff --git a/scripts/common.sh b/scripts/common.sh index 6d28cfc..340bac8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -117,18 +117,24 @@ docker_images_require() { local oldpwd="$PWD" - # Get docker-plaground.git - if [ -d "_docker_playground" ]; then - git -C _docker_playground fetch + if [ -L "_docker_playground" ]; then + echo "NOTE: _docker_playground is a symlink, skipping fetch, checkout, reset" + cd "_docker_playground/$1" else - git clone https://git.osmocom.org/docker-playground/ _docker_playground - fi - cd _docker_playground - git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND" - git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND" + # Get docker-plaground.git + if [ -d "_docker_playground" ]; then + git -C _docker_playground fetch + else + git clone https://git.osmocom.org/docker-playground/ _docker_playground + fi - # jenkins-common.sh expects to run from a subdir in docker-playground.git - cd "$1" + cd _docker_playground + git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND" + git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND" + + # jenkins-common.sh expects to run from a subdir in docker-playground.git + cd "$1" + fi # Subshell: run docker_images_require from jenkins-common.sh, pass all arguments (. ../jenkins-common.sh; docker_images_require "$@") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 Gerrit-Change-Number: 16870 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:01:06 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:01:06 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 14:01:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:01:12 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:01:12 +0000 Subject: Change in osmo-ci[master]: docker: move to docker-playground.git In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16871 ) Change subject: docker: move to docker-playground.git ...................................................................... docker: move to docker-playground.git Instead of building "osmocom:deb9_amd64" from this repository, build "$USER/debian-stretch-jenkins" from docker-playground.git (same Dockerfile). Adjust all jobs to use the new image name. Add a new "update-osmo-ci-on-slaves-dp" jenkins job, which triggers the existing "update-osmo-ci-on-slaves" job whenever docker-playground.git changes. Replace docker/rebuild_osmocom_jenkins_image.sh with scripts/osmo-ci-docker-rebuild.sh, so we can get rid of the docker dir. I thought about dropping the script completely, and directly writing the two lines into contrib/jenkins.sh. But I kept the extra script for convenience, when testing locally. Related: OS#4345 Depends: docker-playground I125ae8a6bcabbd1f485028c79b0abacda0622c3a Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f --- M contrib/jenkins.sh D docker/Dockerfile_osmocom_jenkins.amd64 D docker/rebuild_osmocom_jenkins_image.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmo-gsm-tester-runner.yml M jobs/update-osmo-ci-on-slaves.yml A scripts/osmo-ci-docker-rebuild.sh 8 files changed, 34 insertions(+), 173 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b161230..275fc69 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -11,6 +11,5 @@ git status if [ `uname` = "Linux" ]; then - cd docker - ./rebuild_osmocom_jenkins_image.sh + scripts/osmo-ci-docker-rebuild.sh fi diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 deleted file mode 100644 index 63b6e74..0000000 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ /dev/null @@ -1,146 +0,0 @@ -ARG DEBIAN_VERSION=stretch -FROM debian:${DEBIAN_VERSION} - -# Make "$DEBIAN_VERSION" available after FROM -# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact -ARG DEBIAN_VERSION - -# Install apt dependencies (keep in alphabetic order) -RUN \ - dpkg --add-architecture i386 && \ - DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - asciidoc \ - asciidoc-dblatex \ - autoconf \ - autoconf-archive \ - automake \ - bc \ - bison \ - bzip2 \ - cmake \ - coccinelle \ - cppcheck \ - dahdi-source \ - dblatex \ - dbus \ - debhelper \ - devscripts \ - dh-autoreconf \ - dh-systemd \ - docbook5-xml \ - doxygen \ - flex \ - g++ \ - gawk \ - gcc \ - gcc-arm-none-eabi \ - git \ - git-buildpackage \ - graphviz \ - htop \ - inkscape \ - lcov \ - libaio-dev \ - libasound2-dev \ - libboost-all-dev \ - libc-ares-dev \ - libcsv-dev \ - libdbd-sqlite3 \ - libdbi-dev \ - libffi-dev \ - libfftw3-dev \ - libgmp-dev \ - libgnutls28-dev \ - libgps-dev \ - libgsm1-dev \ - liblua5.3-dev \ - libmnl-dev \ - libncurses5-dev \ - libnewlib-arm-none-eabi \ - liboping-dev \ - libortp-dev \ - libpcap-dev \ - libpcsclite-dev \ - libreadline-dev \ - libsctp-dev \ - libsigsegv-dev \ - libsnmp-dev \ - libsofia-sip-ua-glib-dev \ - libsqlite3-dev \ - libssl-dev \ - libtalloc-dev \ - libtool \ - libusb-1.0-0-dev \ - libusb-dev \ - libxml2-utils \ - libzmq3-dev \ - locales \ - lua-socket \ - make \ - mscgen \ - ofono \ - openssh-client \ - osc \ - patchelf \ - pkg-config \ - python3 \ - python3-gi \ - python3-mako \ - python3-nwdiag \ - python3-pip \ - python3-pyflakes \ - python3-setuptools \ - python3-usb \ - python3-yaml \ - rsync \ - sdcc \ - sqlite3 \ - stow \ - sudo \ - systemd \ - tcpdump \ - texinfo \ - unzip \ - wget \ - xsltproc - -# Install pip dependencies (keep in alphabetic order) -RUN pip3 install \ - git+https://github.com/podshumok/python-smpplib.git \ - git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ - pydbus \ - pysispm - -# match the outside user -RUN useradd --uid=1000 build -#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build - -RUN mkdir /build -RUN chown build:build /build - -# Install osmo-python-tests -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit -RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh - -# Set a UTF-8 locale -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales && \ - update-locale LANG=en_US.UTF-8 -ENV LANG en_US.UTF-8 - -# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above) -ARG LIBULFIUS_VER="2.6.4" -ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}" -ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb -ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz -RUN cd /tmp/ulfius && \ - tar -xvf all.tar.gz && \ - DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \ - cd ~ && \ - rm -r /tmp/ulfius - -# osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user -RUN chown -R build:build /usr/local diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh deleted file mode 100755 index 5d14d83..0000000 --- a/docker/rebuild_osmocom_jenkins_image.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e - -# Executes docker build with the given parameters and retry in case of error. -function build_once() { - # shellcheck disable=SC2068 - docker build $@ -f Dockerfile_osmocom_jenkins.amd64 . -} - -# Builds a container with a debian version and tag name as parameter. -function build_container() { - local tag_name=${1} - local debian_version=${2} - - echo "Pulling ${debian_version} image" - docker pull "debian:${debian_version}" - - echo "Building for ${debian_version} and setting tag ${tag_name}" - build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}" -} - -# Create containers using stretch (Debian 9.0) as base. -build_container osmocom:deb9_amd64 stretch diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index dfc9b88..0c338a6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -40,7 +40,7 @@ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ - docker_img: 'osmocom:deb9_amd64' + docker_img: '$USER/debian-stretch-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 55626ea..78aeb7c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -41,7 +41,7 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - docker_img: 'osmocom:deb9_amd64' + docker_img: '$USER/debian-stretch-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' wrappers: [] trigger: diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index c9d84a3..a4b64fd 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -241,7 +241,8 @@ -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ --cap-add=sys_nice \ - osmocom:deb9_amd64 /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' + $USER/debian-stretch-jenkins \ + /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' publishers: - archive: artifacts: '*-run.tgz, *-bin.tgz' diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 2c7309e..d47f08e 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -39,4 +39,28 @@ - email: recipients: intern at lists.sysmocom.de +# Trigger from docker-playground.git too +- job: + name: update-osmo-ci-on-slaves-dp + description: | + Trigger update-osmo-ci-on-slaves + on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves. + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + skip-tag: true + branches: + - 'origin/master' + triggers: + - pollscm: + cron: "H/5 * * * *" + ignore-post-commit-hooks: false + publishers: + - trigger: + project: "update-osmo-ci-on-slaves" + + # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh new file mode 100755 index 0000000..4a7ee25 --- /dev/null +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -0,0 +1,5 @@ +#!/bin/sh +cd "$(dirname "$0")/.." +. scripts/common.sh +docker_images_require \ + "debian-stretch-jenkins" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f Gerrit-Change-Number: 16871 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:07:48 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:07:48 +0000 Subject: Change in osmo-ci[master]: jobs/gerrit-verifications.yml: add erlang repos In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16872 ) Change subject: jobs/gerrit-verifications.yml: add erlang repos ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 Gerrit-Change-Number: 16872 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 16 Jan 2020 14:07:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:07:51 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:07:51 +0000 Subject: Change in osmo-ci[master]: jobs/gerrit-verifications.yml: add erlang repos In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16872 ) Change subject: jobs/gerrit-verifications.yml: add erlang repos ...................................................................... jobs/gerrit-verifications.yml: add erlang repos Run contrib/jenkins.sh in erlang repositories, that were recently updated (osmo_gsup, osmo_dia2gsup, osmo_ss7). Depends: docker-playground Ia3eaec6090c9652549b2850de74ee21730374bbd Related: OS#4345 Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 --- M jobs/gerrit-verifications.yml M scripts/osmo-ci-docker-rebuild.sh 2 files changed, 20 insertions(+), 1 deletion(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 0c338a6..8846e31 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -41,7 +41,9 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: '$USER/debian-stretch-jenkins' + docker_img_erlang: '$USER/debian-buster-erlang' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' + cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' @@ -109,6 +111,11 @@ concurrent: false cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + - osmo_dia2gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] @@ -124,6 +131,12 @@ {docker_img} /build/contrib/jenkins.sh - osmo-gsm-manuals + + - osmo_gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-hlr - osmo-iuh - osmo-mgw @@ -216,6 +229,11 @@ concurrent: false cmd: './contrib/jenkins.sh' + - ss7: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{cmd_erlang}' + - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' slave_axis: !!python/tuple [ttcn3] diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 4a7ee25..943b5a0 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -2,4 +2,5 @@ cd "$(dirname "$0")/.." . scripts/common.sh docker_images_require \ - "debian-stretch-jenkins" + "debian-stretch-jenkins" \ + "debian-buster-erlang" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I05d152de6b7a04dee935d79b9987c511351eca95 Gerrit-Change-Number: 16872 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:08:08 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 14:08:08 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... logging: use meaningful default loglevels Some logging categories use LOGL_INFO or even LOGL_DEBUG. Lets set those to LOGL_NOTICE to have a less crowded default log output. Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Related: OS#2577 --- M src/host/layer23/src/common/logging.c M src/host/virt_phy/src/logging.c 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/16892/1 diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index ed79991..636a615 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -36,7 +36,7 @@ .name = "DCS", .description = "Cell selection", .color = "\033[34m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DNB] = { .name = "DNB", @@ -48,54 +48,54 @@ .name = "DPLMN", .description = "PLMN selection", .color = "\033[32m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DRR] = { .name = "DRR", .description = "Radio Resource", .color = "\033[1;34m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DMM] = { .name = "DMM", .description = "Mobility Management", .color = "\033[1;32m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DCC] = { .name = "DCC", .description = "Call Control", .color = "\033[1;33m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DSS] = { .name = "DSS", .description = "Supplenmentary Services", .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DSMS] = { .name = "DSMS", .description = "Short Message Service", .color = "\033[1;37m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DMNCC] = { .name = "DMNCC", .description = "Mobile Network Call Control", .color = "\033[1;37m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DMEAS] = { .name = "DMEAS", .description = "MEasurement Reporting", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPAG] = { .name = "DPAG", .description = "Paging", .color = "\033[33m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DL1C] = { .name = "DL1C", @@ -107,37 +107,37 @@ .name = "DSAP", .description = "SAP Control", .color = "\033[1;31m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DSUM] = { .name = "DSUM", .description = "Summary of Process", .color = "\033[1;37m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DSIM] = { .name = "DSIM", .description = "SIM client", .color = "\033[0;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DGPS] = { .name = "DGPS", .description = "GPS", .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DMOB] = { .name = "DMOB", .description = "Mobile", .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPRIM] = { .name = "DPRIM", .description = "PRIM", .color = "\033[1;32m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DLUA] = { .name = "DLUA", diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index aa3b88a..e8370cc 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -70,28 +70,28 @@ .description = "Layer 1 Control", .color = "\033[1;31m", .enabled = 1, - .loglevel = LOGL_DEBUG, + .loglevel = LOGL_NOTICE, }, [DL1P] = { .name = "DL1P", .description = "Layer 1 Data", .color = "\033[1;31m", .enabled = 1, - .loglevel = LOGL_DEBUG, + .loglevel = LOGL_NOTICE, }, [DVIRPHY] = { .name = "DVIRPHY", .description = "Virtual Layer 1 Interface", .color = "\033[1;31m", .enabled = 1, - .loglevel = LOGL_DEBUG, + .loglevel = LOGL_NOTICE, }, [DMAIN] = { .name = "DMAIN", .description = "Main Program / Data Structures", .color = "\033[1;32m", .enabled = 1, - .loglevel = LOGL_DEBUG, + .loglevel = LOGL_NOTICE, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:10:09 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jan 2020 14:10:09 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Abandoned After all I think this patch was not the best Idea. Looking through the projects and correcting the loglevels if needed is better I think. Also I see that the print to stderr messes up some unit-tests. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:41:58 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:41:58 +0000 Subject: Change in osmo-ci[master]: OBS: clone from gerrit.osmocom.org In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16561 ) Change subject: OBS: clone from gerrit.osmocom.org ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e Gerrit-Change-Number: 16561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 16 Jan 2020 14:41:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 14:42:02 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 16 Jan 2020 14:42:02 +0000 Subject: Change in osmo-ci[master]: OBS: clone from gerrit.osmocom.org In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16561 ) Change subject: OBS: clone from gerrit.osmocom.org ...................................................................... OBS: clone from gerrit.osmocom.org Work around "garbage at end of loose object" errors that occasionally cause these jenkins jobs to fail. A few repositories are not hosted on gerrit, so they still get cloned from git.osmocom.org. However, having almost all repositories cloned from gerrit should improve the situation a lot. Related: OS#4083 Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e --- M scripts/common.sh M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 20 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/scripts/common.sh b/scripts/common.sh index 340bac8..1c2dfe0 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,6 +1,7 @@ #!/bin/sh # Various functions and variables used in multiple osmo-ci shell scripts OSMO_GIT_URL="https://git.osmocom.org" +OSMO_GIT_URL_GERRIT="https://gerrit.osmocom.org" # Osmocom repositories of which we want to build release tarballs automatically, and list the current versions at # https://jenkins.osmocom.org/jenkins/job/Osmocom-list-commits/lastSuccessfulBuild/artifact/commits.txt @@ -99,6 +100,20 @@ fi } +# Print git clone URL for an Osmocom git repository. Prefer the gerrit clone URL, because cloning from the regular URL +# sometimes results in the "garbage at end of loose object" error (OS#4083). +# $1: Osmocom project (e.g. "osmo-hlr") +osmo_git_clone_url() { + case "$1" in + rtl-sdr|osmo-fl2k|libosmo-dsp|libgtpnl|libasn1c|libusrp|libsmpp34) + echo "$OSMO_GIT_URL"/"$1" + ;; + *) + echo "$OSMO_GIT_URL_GERRIT"/"$1" + ;; + esac +} + # Print the subdirectory of the repository where the source lies (configure.ac etc.). # Print nothing when the source is in the topdir of the repository. osmo_source_subdir() { diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 509bced..3770ee1 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -55,7 +55,7 @@ if [ "$project" = "limesuite" ]; then [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" else - [ -d "$project" ] || osmo_git_clone_date "https://git.osmocom.org/$project" + [ -d "$project" ] || osmo_git_clone_date "$(osmo_git_clone_url "$project")" fi cd "$project" git fetch @@ -131,6 +131,7 @@ build_osmocom() { prepare + # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() checkout limesuite checkout osmo-gsm-manuals checkout libosmocore diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 1c76cc1..d49d968 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -64,14 +64,13 @@ checkout() { local name=$1 local branch=$2 - local url="https://git.osmocom.org" cd "$REPO" if [ -n "$branch" ] ; then - osmo_git_clone_date "$url/$name" -b "$branch" + osmo_git_clone_date "$(osmo_git_clone_url "$name")" -b "$branch" else - osmo_git_clone_date "$url/$name" + osmo_git_clone_date "$(osmo_git_clone_url "$name")" fi cd - @@ -177,6 +176,7 @@ prepare + # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() checkout_limesuite checkout osmo-gsm-manuals checkout libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e Gerrit-Change-Number: 16561 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 15:26:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 15:26:40 +0000 Subject: Change in docker-playground[master]: Introduuce ttcn-sccp dockerized setup References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduuce ttcn-sccp dockerized setup ...................................................................... Introduuce ttcn-sccp dockerized setup Since examples/sccp_demo_user (the binary used to test SCCP) is not installed by libosmo-sccp.git during make install, we need to install it manually after "make" step, and hence it's only available in osmo-stp-master, because in osmo-stp-latest we used packaged files. Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b --- M osmo-stp-master/Dockerfile A ttcn3-sccp-test/Dockerfile A ttcn3-sccp-test/Makefile A ttcn3-sccp-test/SCCP_Tests.cfg A ttcn3-sccp-test/jenkins.sh 5 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/16893/1 diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 622d0b9..e76e5a9 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -32,6 +32,7 @@ autoreconf -fi && \ ./configure && \ make -j8 install && \ + install examples/sccp_demo_user /usr/local/bin/ && \ ldconfig VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile new file mode 100644 index 0000000..0c70027 --- /dev/null +++ b/ttcn3-sccp-test/Dockerfile @@ -0,0 +1,37 @@ +ARG USER +FROM $USER/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make sccp + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg + +CMD cd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests; \ + exit_code=$?; \ + echo "pespin1: $PWD"; ls -lha .; \ + echo "pespin2:"; ls -lha SCCP_Tests*.log; \ + /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile new file mode 100644 index 0000000..cbcd544 --- /dev/null +++ b/ttcn3-sccp-test/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data + +include ../make/Makefile diff --git a/ttcn3-sccp-test/SCCP_Tests.cfg b/ttcn3-sccp-test/SCCP_Tests.cfg new file mode 100644 index 0000000..7e6d9a0 --- /dev/null +++ b/ttcn3-sccp-test/SCCP_Tests.cfg @@ -0,0 +1,30 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/sccp/SCCP_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "SCCP_Tests" + +[TESTPORT_PARAMETERS] +*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "172.18.22.200" +*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325" + +[MODULE_PARAMETERS] +SCCP_Tests.sccp_cfg := { + { + sccp_service_type := "mtp3_itu", + sctp_addr := { 2905, "172.18.22.203", 2905, "172.18.22.200" }, + own_pc := 185, + own_ssn := 254, + peer_pc := 23, + peer_ssn := 254, + sio := '83'O, + rctx := 0 + } +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +SCCP_Tests.control +SCCP_Tests_RAW.control diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh new file mode 100755 index 0000000..21f301c --- /dev/null +++ b/ttcn3-sccp-test/jenkins.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +# Always require osmo-stp-master since is the only with sccp_demo_user installed +docker_images_require \ + "debian-stretch-build" \ + "osmo-stp-master" \ + "debian-stretch-titan" \ + "ttcn3-sccp-test" + +mkdir $VOL_BASE_DIR/sccp-tester +cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ + +mkdir $VOL_BASE_DIR/sccp +#cp osmo-sccp.cfg $VOL_BASE_DIR/sccp/ + +network_create 172.18.22.0/24 + +echo Starting container with sccp_demo_user +docker run --rm \ + --network $NET_NAME --ip 172.18.22.200 \ + -v $VOL_BASE_DIR/sccp:/data \ + --name ${BUILD_TAG}-stp -d \ + $REPO_USER/osmo-stp-master \ + /bin/sh -c "sccp_demo_user -c -l 172.18.22.200 -r 172.18.22.203 >>/data/sccp_demo_user.log 2>&1" + + +echo Starting container with SCCP testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.22.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/sccp-tester:/data \ + --name ${BUILD_TAG}-ttcn3-sccp-test \ + $REPO_USER/ttcn3-sccp-test + +docker container kill ${BUILD_TAG}-stp + +network_remove +collect_logs -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 15:43:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 15:43:55 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Bind VTY to -l local address cmdline arg References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 ) Change subject: sccp_demo_user: Bind VTY to -l local address cmdline arg ...................................................................... sccp_demo_user: Bind VTY to -l local address cmdline arg Change-Id: Id93db4ea2865f3f2dbfc89890389ebd02fa8172b --- M examples/sccp_demo_user.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/94/16894/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 3cbcc72..4b7b6bc 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -236,7 +236,7 @@ osmo_ss7_vty_init_asp(NULL); osmo_sccp_vty_init(); - rc = telnet_init_dynif(NULL, NULL, vty_get_bind_addr(), 2324+client); + rc = telnet_init_dynif(NULL, NULL, local_address, 2324+client); if (rc < 0) { perror("Error binding VTY port"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id93db4ea2865f3f2dbfc89890389ebd02fa8172b Gerrit-Change-Number: 16894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 17:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 17:24:37 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix null ptr access on malformed or unsupported msg received References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 ) Change subject: sccp: Fix null ptr access on malformed or unsupported msg received ...................................................................... sccp: Fix null ptr access on malformed or unsupported msg received Detected while running a TTCN3 sending malformed SCCP message in SCCP_Tests_RAW.ttcn: sccp_user.c:174:12: runtime error: member access within null pointer of type 'struct xua_msg' ASAN:DEADLYSIGNAL ================================================================= ==6==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000008 (pc 0x7f2a11f93c5c bp 0x7ffefcf05c50 sp 0x7ffefcf05c10 T0) #0 0x7f2a11f93c5b in mtp_user_prim_cb /tmp/libosmo-sccp/src/sccp_user.c:174 #1 0x7f2a11fb48f9 in deliver_to_mtp_user /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:94 #2 0x7f2a11fb4c8a in hmdt_message_for_distribution /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:133 #3 0x7f2a11fb5c90 in m3ua_hmdc_rx_from_l2 /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:275 #4 0x7f2a11f6f5c2 in m3ua_rx_xfer /tmp/libosmo-sccp/src/m3ua.c:586 #5 0x7f2a11f70480 in m3ua_rx_msg /tmp/libosmo-sccp/src/m3ua.c:739 #6 0x7f2a11faee35 in xua_srv_conn_cb /tmp/libosmo-sccp/src/osmo_ss7.c:1623 #7 0x7f2a0f46d082 (/usr/lib/x86_64-linux-gnu/libosmonetif.so.8+0xb082) #8 0x7f2a1186c0be (/usr/lib/x86_64-linux-gnu/libosmocore.so.12+0xc0be) #9 0x7f2a1186c735 in osmo_select_main (/usr/lib/x86_64-linux-gnu/libosmocore.so.12+0xc735) #10 0x557378718219 in main /tmp/libosmo-sccp/examples/sccp_demo_user.c:264 #11 0x7f2a105ad2e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #12 0x557378717059 in _start (/usr/local/bin/sccp_demo_user+0x6059) Change-Id: Idafa8c9693d98ecd214b62155372e4db69e2a4a4 --- M src/sccp_user.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/95/16895/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index 9df5817..386f424 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -171,6 +171,12 @@ case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_INDICATION): /* Convert from SCCP to SUA in xua_msg format */ xua = osmo_sccp_to_xua(oph->msg); + if (!xua) { + LOGP(DLSCCP, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", + msgb_hexdump(oph->msg)); + rc = -1; + break; + } xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idafa8c9693d98ecd214b62155372e4db69e2a4a4 Gerrit-Change-Number: 16895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 17:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 17:24:37 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types ...................................................................... sccp: Add value_string for SCCP message types Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc --- M include/osmocom/sccp/sccp_types.h M src/Makefile.am M src/sccp2sua.c A src/sccp_types.c 4 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/16896/1 diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 18b54f4..71cbb0f 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -26,6 +26,7 @@ #include #include +#include /* Table 1/Q.713 - SCCP message types */ enum sccp_message_types { @@ -51,6 +52,10 @@ SCCP_MSG_TYPE_LUDTS = 20 }; +extern const struct value_string osmo_sccp_msg_type_names[]; +static inline const char *osmo_sccp_msg_type_name(enum sccp_message_types val) +{ return get_value_string(osmo_sccp_msg_type_names, val); } + /* Table 2/Q.713 - SCCP parameter name codes */ enum sccp_parameter_name_codes { SCCP_PNC_END_OF_OPTIONAL = 0, diff --git a/src/Makefile.am b/src/Makefile.am index 4ef753c..484886c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c xua_rkm.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c xua_rkm.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/sccp2sua.c b/src/sccp2sua.c index f68f9a9..7e6b3a3 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1341,6 +1341,10 @@ case SCCP_MSG_TYPE_XUDTS: case SCCP_MSG_TYPE_LUDT: case SCCP_MSG_TYPE_LUDTS: + LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message %s\n", + osmo_sccp_msg_type_name(msg->l2h[0])); + xua_msg_free(xua); + return NULL; default: LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message type %u\n", msg->l2h[0]); diff --git a/src/sccp_types.c b/src/sccp_types.c new file mode 100644 index 0000000..efe9aca --- /dev/null +++ b/src/sccp_types.c @@ -0,0 +1,26 @@ +#include + +/* Table 1/Q.713 - SCCP message types */ +const struct value_string osmo_sccp_msg_type_names[] = { + OSMO_VALUE_STRING(SCCP_MSG_TYPE_CR), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_CC), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_CREF), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_RLSD), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_RLC), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_DT1), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_DT2), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_AK), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_UDT), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_UDTS), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_ED), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_EA), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_RSR), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_RSC), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_ERR), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_IT), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_XUDT), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_XUDTS), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_LUDT), + OSMO_VALUE_STRING(SCCP_MSG_TYPE_LUDTS), + {} +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 17:24:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 17:24:38 +0000 Subject: Change in libosmo-sccp[master]: sccp: Avoid memleak of xua_msg receiving malformed sccp message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 ) Change subject: sccp: Avoid memleak of xua_msg receiving malformed sccp message ...................................................................... sccp: Avoid memleak of xua_msg receiving malformed sccp message first, xua_msg is allocated internally in the function. Then depending on msg type different functions are called. All of those functions either return the same input xua msg pointer or NULL. If they return NULL due to parsing failure, we need to free the internally allocated xua pointer. Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c --- M src/sccp2sua.c 1 file changed, 49 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/97/16897/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 7e6b3a3..1106888 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -998,6 +998,7 @@ local_ref->octet3 = tmp32 & 0xff; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cr(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_request *req = (struct sccp_connection_request *)msg->l2h; @@ -1013,6 +1014,7 @@ return sccp_to_xua_opt(msg, &req->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cr(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_request *req; @@ -1029,6 +1031,7 @@ return xua_ies_to_sccp_opts(msg, &req->optional_start, req->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_confirm *cnf = (struct sccp_connection_confirm *)msg->l2h; @@ -1041,6 +1044,7 @@ return sccp_to_xua_opt(msg, &cnf->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_confirm *cnf; @@ -1055,6 +1059,7 @@ return xua_ies_to_sccp_opts(msg, &cnf->optional_start, cnf->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cref(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_refused *ref = (struct sccp_connection_refused *)msg->l2h; @@ -1066,6 +1071,7 @@ return sccp_to_xua_opt(msg, &ref->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cref(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_refused *ref; @@ -1079,6 +1085,7 @@ return xua_ies_to_sccp_opts(msg, &ref->optional_start, ref->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_rlsd(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_released *rlsd = (struct sccp_connection_released *)msg->l2h; @@ -1106,6 +1113,7 @@ return xua_ies_to_sccp_opts(msg, &rlsd->optional_start, rlsd->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_rlc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_release_complete *rlc; @@ -1129,6 +1137,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_dt1(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_form1 *dt1 = (struct sccp_data_form1 *) msg->l2h; @@ -1157,6 +1166,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udt(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata *udt = (struct sccp_data_unitdata *)msg->l2h; @@ -1192,6 +1202,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; @@ -1228,6 +1239,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h; @@ -1261,6 +1273,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_err(struct msgb *msg, struct xua_msg *xua) { struct sccp_proto_err *err = (struct sccp_proto_err *)msg->l2h; @@ -1302,34 +1315,54 @@ switch (msg->l2h[0]) { case SCCP_MSG_TYPE_CR: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE); - return sccp_to_xua_cr(msg, xua); + if (!sccp_to_xua_cr(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_CC: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK); - return sccp_to_xua_cc(msg, xua); + if (!sccp_to_xua_cc(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_CREF: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COREF); - return sccp_to_xua_cref(msg, xua); + if (!sccp_to_xua_cref(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_RLSD: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE); - return sccp_to_xua_rlsd(msg, xua); + if (!sccp_to_xua_rlsd(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_RLC: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO); - return sccp_to_xua_rlc(msg, xua); + if (!sccp_to_xua_rlc(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_DT1: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT); - return sccp_to_xua_dt1(msg, xua); + if (!sccp_to_xua_dt1(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_UDT: xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT); - return sccp_to_xua_udt(msg, xua); + if (!sccp_to_xua_udt(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_UDTS: xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDR); - return sccp_to_xua_udts(msg, xua); + if (!sccp_to_xua_udts(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_IT: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COIT); - return sccp_to_xua_it(msg, xua); + if (!sccp_to_xua_it(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_ERR: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COERR); - return sccp_to_xua_err(msg, xua); + if (!sccp_to_xua_err(msg, xua)) + goto malformed; + return xua; /* Unsupported Message Types */ case SCCP_MSG_TYPE_DT2: case SCCP_MSG_TYPE_AK: @@ -1353,6 +1386,12 @@ } return NULL; + +malformed: + LOGP(DLSUA, LOGL_ERROR, "Malformed SCCP message %s\n", + osmo_sccp_msg_type_name(msg->l2h[0])); + xua_msg_free(xua); + return NULL; } /*! \brief convert parsed SUA message to SCCP message -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c Gerrit-Change-Number: 16897 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 17:32:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 17:32:40 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server.c: Fix typo in log message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 ) Change subject: examples/sccp_test_server.c: Fix typo in log message ...................................................................... examples/sccp_test_server.c: Fix typo in log message Change-Id: I8456893b77624402645728ce9403847065a662eb --- M examples/sccp_test_server.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/98/16898/1 diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 6249e45..a66cb21 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -87,7 +87,7 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: N-UNITDATA.ind: Connectiong back to sender\n", __func__); + printf("%s: N-UNITDATA.ind: Connecting back to sender\n", __func__); osmo_sccp_tx_conn_req(scu, conn_id++, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8456893b77624402645728ce9403847065a662eb Gerrit-Change-Number: 16898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 17:41:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 17:41:11 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: log category name instead of its hex value References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 ) Change subject: examples/sccp_demo_user: log category name instead of its hex value ...................................................................... examples/sccp_demo_user: log category name instead of its hex value Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 --- M examples/sccp_demo_user.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/99/16899/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 4b7b6bc..8cf3c33 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -72,6 +72,8 @@ void *tall_ctx = talloc_named_const(NULL, 1, "example"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); + log_set_print_category(osmo_stderr_target, true); + log_set_print_category_hex(osmo_stderr_target, false); for (i = 0; i < ARRAY_SIZE(log_cats); i++) log_set_category_filter(osmo_stderr_target, log_cats[i], 1, LOGL_DEBUG); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 Gerrit-Change-Number: 16899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 18:18:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 18:18:54 +0000 Subject: Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 ) Change subject: sccp: Convert ifelse to switch statement ...................................................................... sccp: Convert ifelse to switch statement Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 --- M src/sccp2sua.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/00/16900/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 1106888..e68662f 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -712,13 +712,14 @@ oneopt = opt_start; while (oneopt < msg->tail) { - uint8_t opt_type = oneopt[0]; + enum sccp_parameter_name_codes opt_type = oneopt[0]; + uint8_t opt_len; + uint16_t opt_len16; - if (opt_type == SCCP_PNC_END_OF_OPTIONAL) + switch (opt_type) { + case SCCP_PNC_END_OF_OPTIONAL: return xua; - - if (opt_type == SCCP_PNC_LONG_DATA) { - uint16_t opt_len16; + case SCCP_PNC_LONG_DATA: /* two byte length field */ if (oneopt + 2 > msg->tail) return NULL; @@ -727,8 +728,8 @@ return NULL; xua_msg_add_sccp_opt(xua, opt_type, opt_len16, oneopt+3); oneopt += 3 + opt_len16; - } else { - uint8_t opt_len; + break; + default: /* one byte length field */ if (oneopt + 1 > msg->tail) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 Gerrit-Change-Number: 16900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 18:18:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 18:18:54 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 ) Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... sccp: Improve logging in sccp_to_xua_opt() Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c M src/sccp_types.c 3 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/01/16901/1 diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 71cbb0f..f43f822 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -80,6 +80,10 @@ SCCP_PNC_LONG_DATA = 19, }; +extern const struct value_string osmo_sccp_pnc_names[]; +static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val) +{ return get_value_string(osmo_sccp_pnc_names, val); } + /* Figure 3/Q.713 Called/calling party address */ enum { SCCP_TITLE_IND_NONE = 0, diff --git a/src/sccp2sua.c b/src/sccp2sua.c index e68662f..b829cf6 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -711,10 +711,11 @@ oneopt = opt_start; + enum sccp_parameter_name_codes opt_type = 0; /* dummy value not used */ while (oneopt < msg->tail) { - enum sccp_parameter_name_codes opt_type = oneopt[0]; uint8_t opt_len; uint16_t opt_len16; + opt_type = oneopt[0]; switch (opt_type) { case SCCP_PNC_END_OF_OPTIONAL: @@ -722,25 +723,30 @@ case SCCP_PNC_LONG_DATA: /* two byte length field */ if (oneopt + 2 > msg->tail) - return NULL; + goto malformed; opt_len16 = oneopt[1] << 8 | oneopt[2]; if (oneopt + 3 + opt_len16 > msg->tail) - return NULL; + goto malformed; xua_msg_add_sccp_opt(xua, opt_type, opt_len16, oneopt+3); oneopt += 3 + opt_len16; break; default: /* one byte length field */ if (oneopt + 1 > msg->tail) - return NULL; + goto malformed; opt_len = oneopt[1]; if (oneopt + 2 + opt_len > msg->tail) - return NULL; + goto malformed; xua_msg_add_sccp_opt(xua, opt_type, opt_len, oneopt+2); oneopt += 2 + opt_len; } } + LOGP(DLSUA, LOGL_ERROR, "Parameter %s not found\n", osmo_sccp_pnc_name(SCCP_PNC_END_OF_OPTIONAL)); + return NULL; + +malformed: + LOGP(DLSUA, LOGL_ERROR, "Malformed parameter %s (%d)\n", osmo_sccp_pnc_name(opt_type), opt_type); return NULL; } diff --git a/src/sccp_types.c b/src/sccp_types.c index efe9aca..9370f9a 100644 --- a/src/sccp_types.c +++ b/src/sccp_types.c @@ -24,3 +24,28 @@ OSMO_VALUE_STRING(SCCP_MSG_TYPE_LUDTS), {} }; + +/* Table 2/Q.713 - SCCP parameter name codes */ +const struct value_string osmo_sccp_pnc_names[] = { + OSMO_VALUE_STRING(SCCP_PNC_END_OF_OPTIONAL), + OSMO_VALUE_STRING(SCCP_PNC_DESTINATION_LOCAL_REFERENCE), + OSMO_VALUE_STRING(SCCP_PNC_SOURCE_LOCAL_REFERENCE), + OSMO_VALUE_STRING(SCCP_PNC_CALLED_PARTY_ADDRESS), + OSMO_VALUE_STRING(SCCP_PNC_CALLING_PARTY_ADDRESS), + OSMO_VALUE_STRING(SCCP_PNC_PROTOCOL_CLASS), + OSMO_VALUE_STRING(SCCP_PNC_SEGMENTING), + OSMO_VALUE_STRING(SCCP_PNC_RECEIVE_SEQ_NUMBER), + OSMO_VALUE_STRING(SCCP_PNC_SEQUENCING), + OSMO_VALUE_STRING(SCCP_PNC_CREDIT), + OSMO_VALUE_STRING(SCCP_PNC_RELEASE_CAUSE), + OSMO_VALUE_STRING(SCCP_PNC_RETURN_CAUSE), + OSMO_VALUE_STRING(SCCP_PNC_RESET_CAUSE), + OSMO_VALUE_STRING(SCCP_PNC_ERROR_CAUSE), + OSMO_VALUE_STRING(SCCP_PNC_REFUSAL_CAUSE), + OSMO_VALUE_STRING(SCCP_PNC_DATA), + OSMO_VALUE_STRING(SCCP_PNC_SEGMENTATION), + OSMO_VALUE_STRING(SCCP_PNC_HOP_COUNTER), + OSMO_VALUE_STRING(SCCP_PNC_IMPORTANCE), + OSMO_VALUE_STRING(SCCP_PNC_LONG_DATA), + {} +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 18:56:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 18:56:22 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 to look at the new patch set (#2). Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... sccp: Improve logging in sccp_to_xua_opt() Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c M src/sccp_types.c 3 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/01/16901/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 18:56:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jan 2020 18:56:22 +0000 Subject: Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params ...................................................................... sccp: Support receiving messages with no optional params Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 --- M src/sccp2sua.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/02/16902/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index b829cf6..2be27ea 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -705,6 +705,12 @@ /* some bounds checking */ if (ptr_opt < msg->data || ptr_opt > msg->tail) return NULL; + + /* Q.713 section 2.3 "Coding of pointers": pointer value all zeros used + to indicate that no optional param is present. */ + if (*ptr_opt == 0) + return xua; + opt_start = ptr_opt + *ptr_opt; if (opt_start > msg->tail) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:22:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:22:32 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Bind VTY to -l local address cmdline arg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 ) Change subject: sccp_demo_user: Bind VTY to -l local address cmdline arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id93db4ea2865f3f2dbfc89890389ebd02fa8172b Gerrit-Change-Number: 16894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:23:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:23:16 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix null ptr access on malformed or unsupported msg received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 ) Change subject: sccp: Fix null ptr access on malformed or unsupported msg received ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idafa8c9693d98ecd214b62155372e4db69e2a4a4 Gerrit-Change-Number: 16895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:23:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:24:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:24:31 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/16896/1/src/sccp_types.c File src/sccp_types.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16896/1/src/sccp_types.c at 6 PS1, Line 6: OSMO_VALUE_STRING(SCCP_MSG_TYPE_CC), I would once again vote for having conscise names as used in the spec (CR/CC/...) rather than a lengthy SCCP_MSG_TYPE_CC in the logs. That kind of usage is exactly why I dislike OSMO_VALUE_STRING in many situations. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:24:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:04 +0000 Subject: Change in libosmo-sccp[master]: sccp: Avoid memleak of xua_msg receiving malformed sccp message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 ) Change subject: sccp: Avoid memleak of xua_msg receiving malformed sccp message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c Gerrit-Change-Number: 16897 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:25:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:09 +0000 Subject: Change in libosmo-sccp[master]: sccp_demo_user: Bind VTY to -l local address cmdline arg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 ) Change subject: sccp_demo_user: Bind VTY to -l local address cmdline arg ...................................................................... sccp_demo_user: Bind VTY to -l local address cmdline arg Change-Id: Id93db4ea2865f3f2dbfc89890389ebd02fa8172b --- M examples/sccp_demo_user.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 3cbcc72..4b7b6bc 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -236,7 +236,7 @@ osmo_ss7_vty_init_asp(NULL); osmo_sccp_vty_init(); - rc = telnet_init_dynif(NULL, NULL, vty_get_bind_addr(), 2324+client); + rc = telnet_init_dynif(NULL, NULL, local_address, 2324+client); if (rc < 0) { perror("Error binding VTY port"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id93db4ea2865f3f2dbfc89890389ebd02fa8172b Gerrit-Change-Number: 16894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:10 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix null ptr access on malformed or unsupported msg received In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 ) Change subject: sccp: Fix null ptr access on malformed or unsupported msg received ...................................................................... sccp: Fix null ptr access on malformed or unsupported msg received Detected while running a TTCN3 sending malformed SCCP message in SCCP_Tests_RAW.ttcn: sccp_user.c:174:12: runtime error: member access within null pointer of type 'struct xua_msg' ASAN:DEADLYSIGNAL ================================================================= ==6==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000008 (pc 0x7f2a11f93c5c bp 0x7ffefcf05c50 sp 0x7ffefcf05c10 T0) #0 0x7f2a11f93c5b in mtp_user_prim_cb /tmp/libosmo-sccp/src/sccp_user.c:174 #1 0x7f2a11fb48f9 in deliver_to_mtp_user /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:94 #2 0x7f2a11fb4c8a in hmdt_message_for_distribution /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:133 #3 0x7f2a11fb5c90 in m3ua_hmdc_rx_from_l2 /tmp/libosmo-sccp/src/osmo_ss7_hmrt.c:275 #4 0x7f2a11f6f5c2 in m3ua_rx_xfer /tmp/libosmo-sccp/src/m3ua.c:586 #5 0x7f2a11f70480 in m3ua_rx_msg /tmp/libosmo-sccp/src/m3ua.c:739 #6 0x7f2a11faee35 in xua_srv_conn_cb /tmp/libosmo-sccp/src/osmo_ss7.c:1623 #7 0x7f2a0f46d082 (/usr/lib/x86_64-linux-gnu/libosmonetif.so.8+0xb082) #8 0x7f2a1186c0be (/usr/lib/x86_64-linux-gnu/libosmocore.so.12+0xc0be) #9 0x7f2a1186c735 in osmo_select_main (/usr/lib/x86_64-linux-gnu/libosmocore.so.12+0xc735) #10 0x557378718219 in main /tmp/libosmo-sccp/examples/sccp_demo_user.c:264 #11 0x7f2a105ad2e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #12 0x557378717059 in _start (/usr/local/bin/sccp_demo_user+0x6059) Change-Id: Idafa8c9693d98ecd214b62155372e4db69e2a4a4 --- M src/sccp_user.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_user.c b/src/sccp_user.c index 9df5817..386f424 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -171,6 +171,12 @@ case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_INDICATION): /* Convert from SCCP to SUA in xua_msg format */ xua = osmo_sccp_to_xua(oph->msg); + if (!xua) { + LOGP(DLSCCP, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", + msgb_hexdump(oph->msg)); + rc = -1; + break; + } xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idafa8c9693d98ecd214b62155372e4db69e2a4a4 Gerrit-Change-Number: 16895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:18 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server.c: Fix typo in log message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 ) Change subject: examples/sccp_test_server.c: Fix typo in log message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8456893b77624402645728ce9403847065a662eb Gerrit-Change-Number: 16898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:25:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:27 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: log category name instead of its hex value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 ) Change subject: examples/sccp_demo_user: log category name instead of its hex value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 Gerrit-Change-Number: 16899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:25:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:25:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:25:44 +0000 Subject: Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 ) Change subject: sccp: Convert ifelse to switch statement ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 Gerrit-Change-Number: 16900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:25:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:26:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:26:24 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 ) Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/16901/2/src/sccp_types.c File src/sccp_types.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16901/2/src/sccp_types.c at 36 PS2, Line 36: OSMO_VALUE_STRING(SCCP_PNC_SEGMENTING), same here. Having "SCCP_PNC_" as a prefix in every related log message is of no benefit to the user. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:26:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:26:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:26:44 +0000 Subject: Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:26:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:27:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:27:06 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16890 ) Change subject: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6b19e50f65bca6fe556c748f3c2b633f65037dce Gerrit-Change-Number: 16890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:27:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:27:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:27:07 +0000 Subject: Change in docker-playground[master]: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16890 ) Change subject: ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master ...................................................................... ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master Change-Id: I6b19e50f65bca6fe556c748f3c2b633f65037dce --- M ttcn3-stp-test/Dockerfile 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index a755c94..e6bb9d0 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -11,9 +11,7 @@ RUN git config --global user.email docker at dock.er && \ git config --global user.name "Dock Er" -# FIXME: Once STP patches in laforge/stp are merged into master, then -# OSMO_TTCN3_BRANCH can be set again to "master". -ARG OSMO_TTCN3_BRANCH="laforge/stp" +ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit RUN cd osmo-ttcn3-hacks && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6b19e50f65bca6fe556c748f3c2b633f65037dce Gerrit-Change-Number: 16890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:27:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:27:31 +0000 Subject: Change in docker-playground[master]: README.md: Document how to get gdb backtrace from process crash In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16891 ) Change subject: README.md: Document how to get gdb backtrace from process crash ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I507707a3ed0e7f88bcc9006612df531c848b949e Gerrit-Change-Number: 16891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:27:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:27:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:27:33 +0000 Subject: Change in docker-playground[master]: README.md: Document how to get gdb backtrace from process crash In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16891 ) Change subject: README.md: Document how to get gdb backtrace from process crash ...................................................................... README.md: Document how to get gdb backtrace from process crash Change-Id: I507707a3ed0e7f88bcc9006612df531c848b949e --- M README.md 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/README.md b/README.md index 05ee31f..479e045 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,43 @@ decided to scrap the file, and just keep the short list of dependencies right above where they would be needed in the `jenkins.sh`. +## Obtaining gdb backtrace from crash + +If for instance TTCN3 test is producing a crash on a program running in docker, +eg. osmo-msc, it is desirable to get a full crash report. This section describes +how to do so. + +First, open `osmo-$program/Dockerfile` and add lines to install `gdb` plus +`$program` dependency debug packages. For instance: + +``` ++RUN apt-get install -y --no-install-recommends \ ++ gdb \ ++ libosmocore-dbg libosmo-abis-dbg libosmo-netif-dbg libosmo-sigtran-dbg osmo-msc-dbg && \ ++ apt-get clean +``` + +In same `Dockerfile` file, modify configure to build with debug symbols enabled +and other interesting options, such as `--enable-sanitize`: + +``` +- ./configure --enable-smpp --enable-iu && \ ++ export CPPFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ export CFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ export CXXFLAGS="-g -O0 -fno-omit-frame-pointer" && \ ++ ./configure --enable-smpp --enable-iu --enable-sanitize && \ +``` + +Finally open the script you use to run the program (for instance +`ttcn3-$program-master/jenkins.sh`), and modify it to launch the process using +gdb, and to print a full backtrace when control returns to gdb (when the process +crashes): + +``` +-/bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" ++/bin/sh -c "gdb -ex 'run' -ex 'bt full' --arg osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" +``` + ## See also * [Overhyped Docker](http://laforge.gnumonks.org/blog/20170503-docker-overhyped/) for related rambling on why this doesn't work as well as one would -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I507707a3ed0e7f88bcc9006612df531c848b949e Gerrit-Change-Number: 16891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:29:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:29:51 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 20:29:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:29:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:29:53 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... bsc_main: use higher default loglevels. The loglevels of DNM, DFILTER and DPCU are set to low, lets set them all to NOTICE Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Related: OS#2577 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 6b14279..66310b3 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -713,7 +713,7 @@ .name = "DNM", .description = "A-bis Network Management / O&M (NM/OML)", .color = "\033[1;36m", - .enabled = 1, .loglevel = LOGL_INFO, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPAG] = { .name = "DPAG", @@ -761,12 +761,12 @@ [DFILTER] = { .name = "DFILTER", .description = "BSC/NAT IMSI based filtering", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DPCU] = { .name = "DPCU", .description = "PCU Interface", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DLCLS] = { .name = "DLCLS", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:33:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:33:19 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c at 52 PS3, Line 52: LOGL_INFO maybe switch this to DEBUG, as a non-changing TA is the default, and one might want to see only the changes (above as INFO). can be a follow-up patch, as this deviates from existing code and is not part of moving it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 20:33:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:34:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:34:36 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Thu, 16 Jan 2020 20:34:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:35:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:35:04 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... DFU: add DFU application this adds the DFU as application, allowing to flash the bootloader. a USB DFU alternative is added to flash the bootloader partition. when the DFU is started as bootloader, the partition/alternative to flash the bootloader is marked as "not available", and ineffective. the same happens for the application partition when DFU is started as application. this distinction is make at compile time, not at runtime, because of size restrictions (the bootloader was already close to the 16 kB limit). *_dfu_flash.bin should not be mixed with *_dfu_dfu.bin. *_dfu_dfu.bin should be flashed as application using the already existing DFU bootloader. once this images is started (as application), the *_dfu_flash.bin should be flashed as bootloader using the DFU application. once the DFU bootloader has been flashed, soft resetting (not re-powering) will cause the bootloader to start, allowing to flash the application with a normal image (e.g. not DFU), replacing the DFU application. this switch to DFU only happens after downloading (e.g. flashing). it is planned to have the DFU application erase itself after flashing, but this is currently not implemented. Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 --- M firmware/Makefile M firmware/apps/dfu/main.c M firmware/apps/dfu/usb_strings.txt M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/board_cstartup_gnu.c 9 files changed, 92 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/Makefile b/firmware/Makefile index 5c7aa92..bdca6e5 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -41,7 +41,7 @@ # Defines which are the available memory targets for the SAM3S-EK board. ifeq ($(APP), dfu) -MEMORIES ?= flash +MEMORIES ?= flash dfu else MEMORIES ?= dfu endif diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 5aafc7c..2e80884 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -26,8 +26,15 @@ #include +/* USB alternate interface index used to identify which partition to flash */ +/** USB alternate interface index indicating RAM partition */ #define ALTIF_RAM 0 +/** USB alternate interface index indicating flash partition */ +#if defined(ENVIRONMENT_flash) #define ALTIF_FLASH 1 +#elif defined(ENVIRONMENT_dfu) +#define ALTIF_FLASH 2 +#endif unsigned int g_unique_id[4]; /* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */ @@ -44,10 +51,18 @@ *----------------------------------------------------------------------------*/ #define RAM_ADDR(offset) (IRAM_ADDR + BOARD_DFU_RAM_SIZE + offset) +#if defined(ENVIRONMENT_flash) #define FLASH_ADDR(offset) (IFLASH_ADDR + BOARD_DFU_BOOT_SIZE + offset) +#elif defined(ENVIRONMENT_dfu) +#define FLASH_ADDR(offset) (IFLASH_ADDR + offset) +#endif -#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE) -#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE) +#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE) +#if defined(ENVIRONMENT_flash) +#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE) +#elif defined(ENVIRONMENT_dfu) +#define IFLASH_END ((uint8_t *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) +#endif /* incoming call-back: Host has transferred 'len' bytes (stored at * 'data'), which we shall write to 'offset' into the partition @@ -90,7 +105,11 @@ break; case ALTIF_FLASH: addr = FLASH_ADDR(offset); +#if defined(ENVIRONMENT_flash) if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) { +#elif defined(ENVIRONMENT_dfu) + if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { +#endif g_dfu->state = DFU_STATE_dfuERROR; g_dfu->status = DFU_STATUS_errADDRESS; rc = DFU_RET_STALL; @@ -281,12 +300,12 @@ TRACE_INFO("DFU bootloader start reason: "); switch (USBDFU_OverrideEnterDFU()) { case 0: - /* 0 normally means that there is no override, but we are in the bootloader, - * thus the first check in board_cstartup_gnu did return something else than 0. - * this can only be g_dfu->magic which is erased when the segment are - * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU. - * no static variable can be used to store this case since this will also be overwritten - */ + if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { + TRACE_INFO_WP("unknown\n\r"); + } else { + TRACE_INFO_WP("DFU is the main application\n\r"); + } + break; case 1: TRACE_INFO_WP("DFU switch requested by main application\n\r"); break; diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt index f1c79bc..4a58cb8 100644 --- a/firmware/apps/dfu/usb_strings.txt +++ b/firmware/apps/dfu/usb_strings.txt @@ -3,3 +3,4 @@ DFU (Device Firmware Upgrade) RAM Flash (Application Partition) +Flash (Bootloader Partition) diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index ac2595c..1ebab5b 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1171,12 +1171,19 @@ /* if we are currently in the DFU bootloader, and we are beyond * the MANIFEST stage, we shall switch to the normal * application */ - if (g_dfu->past_manifest) + if (g_dfu->past_manifest) { +#if defined(ENVIRONMENT_flash) USBDFU_SwitchToApp(); +#elif defined(ENVIRONMENT_dfu) + USBDFU_SwitchToDFU(); +#endif + } + #else /* if we are currently in the main application, and we are in - * appDETACH state, switch into the DFU bootloader */ - if (g_dfu->state == DFU_STATE_appDETACH) + * appDETACH state or past downloading, switch into the DFU bootloader. + */ + if (g_dfu->state == DFU_STATE_appDETACH || g_dfu->state == DFU_STATE_dfuMANIFEST) DFURT_SwitchToDFU(); #endif /* APPLICATION_dfu */ #endif /* BOARD_USB_DFU */ diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h index 7354696..5bd8684 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h @@ -124,6 +124,9 @@ /* USBD tells us to switch from DFU mode to application mode */ void USBDFU_SwitchToApp(void); +/* USBD tells us to switch from to DFU mode */ +void USBDFU_SwitchToDFU(void); + /* Return values to be used by USBDFU_handle_{dn,up}load */ #define DFU_RET_NOTHING 0 #define DFU_RET_ZLP 1 diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c index ebbe070..faebc13 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c @@ -19,9 +19,10 @@ STR_MANUF = 1, STR_PROD, STR_CONFIG, + // strings for the first alternate interface (e.g. DFU) _STR_FIRST_ALT, // serial string - STR_SERIAL = (_STR_FIRST_ALT+BOARD_DFU_NUM_IF), + STR_SERIAL = (_STR_FIRST_ALT + BOARD_DFU_NUM_IF), // version string (on additional interface) VERSION_CONF_STR, VERSION_STR, @@ -29,6 +30,25 @@ STRING_DESC_CNT, }; +/* string used to replace one of both DFU flash partition atlsettings */ +static const unsigned char usb_string_notavailable[] = { + USBStringDescriptor_LENGTH(13), + USBGenericDescriptor_STRING, + USBStringDescriptor_UNICODE('n'), + USBStringDescriptor_UNICODE('o'), + USBStringDescriptor_UNICODE('t'), + USBStringDescriptor_UNICODE(' '), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('v'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('i'), + USBStringDescriptor_UNICODE('l'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('l'), + USBStringDescriptor_UNICODE('e'), +}; + /* USB string for the serial (using 128-bit device ID) */ static unsigned char usb_string_serial[] = { USBStringDescriptor_LENGTH(32), @@ -121,7 +141,7 @@ .bNumEndpoints = 0, \ .bInterfaceClass = 0xfe, \ .bInterfaceSubClass = 1, \ - .iInterface = (_STR_FIRST_ALT+ALT), \ + .iInterface = (_STR_FIRST_ALT + ALT), \ .bInterfaceProtocol = 2, \ } @@ -180,6 +200,11 @@ for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { usb_strings_extended[i] = usb_strings[i]; } +#if defined(ENVIRONMENT_dfu) + usb_strings_extended[_STR_FIRST_ALT + 1] = usb_string_notavailable; +#elif defined(ENVIRONMENT_flash) + usb_strings_extended[_STR_FIRST_ALT + 2] = usb_string_notavailable; +#endif usb_strings_extended[STR_SERIAL] = usb_string_serial; usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf; usb_strings_extended[VERSION_STR] = usb_string_version; diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index 1cca7ab..cfb9f63 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -43,7 +43,7 @@ /** structure containing the DFU state and magic value to know if DFU or application should be started */ __dfudata struct dfudata _g_dfu = { - .state = DFU_STATE_appIDLE, + .state = DFU_STATE_dfuIDLE, .past_manifest = 0, .total_bytes = 0, }; @@ -463,7 +463,20 @@ /* make sure the MAGIC is not set to enter DFU again */ g_dfu->magic = 0; - printf("switching to app\r\n"); + /* disconnect from USB to ensure re-enumeration */ + USBD_Disconnect(); + + /* disable any interrupts during transition */ + __disable_irq(); + + /* Tell the hybrid to execute FTL JUMP! */ + NVIC_SystemReset(); +} + +void USBDFU_SwitchToDFU(void) +{ + /* make sure the MAGIC is not set to enter DFU again */ + g_dfu->magic = USB_DFU_MAGIC; /* disconnect from USB to ensure re-enumeration */ USBD_Disconnect(); diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index dd21e4b..7c4b908 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -112,10 +112,13 @@ #define BOARD_USB_UDP #define BOARD_USB_DFU + + #define BOARD_DFU_BOOT_SIZE (16 * 1024) #define BOARD_DFU_RAM_SIZE (2 * 1024) #define BOARD_DFU_PAGE_SIZE 512 -#define BOARD_DFU_NUM_IF 2 +/** number of DFU interfaces (used to flash specific partitions) */ +#define BOARD_DFU_NUM_IF 3 extern void board_exec_dbg_cmd(int ch); extern void board_main_top(void); diff --git a/firmware/libboard/common/source/board_cstartup_gnu.c b/firmware/libboard/common/source/board_cstartup_gnu.c index e82a2fb..d548a30 100644 --- a/firmware/libboard/common/source/board_cstartup_gnu.c +++ b/firmware/libboard/common/source/board_cstartup_gnu.c @@ -126,7 +126,7 @@ IrqHandlerNotUsed /* 35 not used */ }; -#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) +#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash) #include "usb/device/dfu/dfu.h" static void BootIntoApp(void) { @@ -159,8 +159,9 @@ LowLevelInit() ; -#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) - if (!USBDFU_OverrideEnterDFU()) { +#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash) + // boot application if there is not DFU override + if (!USBDFU_OverrideEnterDFU() && SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { UART_Exit(); __disable_irq(); BootIntoApp(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 3 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:36:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:36:13 +0000 Subject: Change in simtrace2[master]: add script to flash latest firmware In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16874 ) Change subject: add script to flash latest firmware ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ebe0f54b6e3b7b45478603cc0a5b56e87b1f461 Gerrit-Change-Number: 16874 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jan 2020 20:36:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 16 20:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jan 2020 20:36:23 +0000 Subject: Change in simtrace2[master]: add script to flash latest firmware In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16874 ) Change subject: add script to flash latest firmware ...................................................................... add script to flash latest firmware this python script lists the SIMtrace 2 devices connected to USB and will flash the latest version of the application (if necessary). it requires pyusb and dfu-util. it is intended for end users so they don't need to read the length and error-prone instructions provided in the wiki. TODO: - support updating bootloader (once dfu-ram image exists) - use python implementation of dfu-util to be python only Change-Id: I3ebe0f54b6e3b7b45478603cc0a5b56e87b1f461 --- A contrib/flash.py 1 file changed, 162 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/flash.py b/contrib/flash.py new file mode 100755 index 0000000..435d311 --- /dev/null +++ b/contrib/flash.py @@ -0,0 +1,162 @@ +#!/usr/bin/env python +# encoding: utf-8 +# python: 3.8.1 + +# library to enumerate USB devices +import usb.core +from usb.util import * +# more elegant structure +from typing import NamedTuple +# regular expressions utilities +import re +# open utilities to handle files +import os, sys +# to download the firmwares +import urllib.request +# to flash using DFU-util +import subprocess + +# SIMtrace 2 device information +class Device(NamedTuple): + usb_vendor_id: int + usb_product_id: int + name: str + url: dict # 1: sniff/trace firmware, 2: card emulation firmware + +# SIMtrace 2 devices definitions +DEVICE_SIMTRACE = Device(usb_vendor_id=0x1d50, usb_product_id=0x60e3, name="SIMtrace 2", url={"trace": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-trace-dfu-latest.bin", "cardem": "https://osmocom.org/attachments/download/3868/simtrace-cardem-dfu.bin"}) +DEVICE_QMOD = Device(usb_vendor_id=0x1d50, usb_product_id=0x4004, name="sysmoQMOD (Quad Modem)", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/qmod-cardem-dfu-latest.bin"}) +DEVICE_OWHW = Device(usb_vendor_id=0x1d50, usb_product_id=0x4001, name="OWHW", url={"cardem": "https://ftp.osmocom.org/binaries/simtrace2/firmware/latest/owhw-cardem-dfu-latest.bin"}) +DEVICES = [DEVICE_SIMTRACE, DEVICE_QMOD] + +# which firmware does the SIMtrace USN interface subclass correspond +FIRMWARE_SUBCLASS = {1: "trace", 2: "cardem"} + +def print_help(): + print("this script will flash SIMtrace 2 - based devices") + print("when no argument is provided, it will try to flash the application firmware of all SIMtrace 2 devices connected to USB with the latest version") + print("to flash a specific firmware, provide the name as argument") + print("the possible firmwares are: trace, cardem") + print("to list all devices connected to USB, provide the argument \"list\"") + +# the firmware to flash +to_flash = None + +# parse command line argument +if len(sys.argv) == 2: + to_flash = sys.argv[1] +if to_flash not in ["list", "trace", "cardem"] and len(sys.argv) > 1: + print_help() + exit(0) + +# get all USB devices +devices = [] +devices_nb = 0 +updated_nb = 0 +usb_devices = usb.core.find(find_all=True) +for usb_device in usb_devices: + # find SIMtrace devices + definitions = list(filter(lambda x: x.usb_vendor_id == usb_device.idVendor and x.usb_product_id == usb_device.idProduct, DEVICES)) + if 1 != len(definitions): + continue + devices_nb += 1 + definition = definitions[0] + serial = usb_device.serial_number or "unknown" + usb_path = str(usb_device.bus) + "-" + ".".join(map(str, usb_device.port_numbers)) + print("found " + definition.name + " device (chip ID " + serial + ") at USB path " + usb_path) + # determine if we are running DFU (in most cases the bootloader, but could also be the application) + dfu_interface = None + for configuration in usb_device: + # get DFU interface descriptor + dfu_interface = dfu_interface or find_descriptor(configuration, bInterfaceClass=254, bInterfaceSubClass=1) + if (None == dfu_interface): + print("no DFU USB interface found") + continue + dfu_mode = (2 == dfu_interface.bInterfaceProtocol) # InterfaceProtocol 1 is runtime mode, 2 is DFU mode + # determine firmware type (when not in DFU mode) + firmware = None + simtrace_interface = None + for configuration in usb_device: + simtrace_interface = simtrace_interface or find_descriptor(configuration, bInterfaceClass=255) + if simtrace_interface and simtrace_interface.bInterfaceSubClass in FIRMWARE_SUBCLASS: + firmware = firmware or FIRMWARE_SUBCLASS[simtrace_interface.bInterfaceSubClass] + if dfu_mode: + firmware = 'dfu' + if firmware: + print("installed firmware: " + firmware) + else: + print("unknown installed firmware") + continue + # determine version of the application/bootloader firmware + version = None + version_interface = None + for configuration in usb_device: + # get custom interface with string + version_interface = version_interface or find_descriptor(configuration, bInterfaceClass=255, bInterfaceSubClass=255) + if version_interface and version_interface.iInterface and version_interface.iInterface > 0 and get_string(usb_device, version_interface.iInterface): + version = get_string(usb_device, version_interface.iInterface) + if not version: + # the USB serial is set (in the application) since version 0.5.1.34-e026 from 2019-08-06 + # https://git.osmocom.org/simtrace2/commit/?id=e0265462d8c05ebfa133db2039c2fbe3ebbd286e + # the USB serial is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18 + # https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a + # the firmware version is set (in the application) since version 0.5.1.37-ede8 from 2019-08-13 + # https://git.osmocom.org/simtrace2/commit/?id=ede87e067dadd07119f24e96261b66ac92b3af6f + # the firmware version is set (in the bootloader) since version 0.5.1.45-ac7e from 2019-11-18 + # https://git.osmocom.org/simtrace2/commit/?id=5db9402a5f346e30288db228157f71c29aefce5a + if dfu_mode: + if serial: + version = "< 0.5.1.45-ac7e" + else: + versoin = "< 0.5.1.45-ac7e" + else: + if serial: + version = "< 0.5.1.37-ede8" + else: + versoin = "< 0.5.1.34-e026" + print("device firmware version: " + version) + # flash latest firmware + if to_flash == "list": # we just want to list the devices, not flash them + continue + # check the firmware exists + if firmware == "dfu" and to_flash is None: + print("device is currently in DFU mode. you need to specify which firmware to flash") + continue + to_flash = to_flash or firmware + if to_flash not in definition.url.keys(): + print("no firmware image available for " + firmware + " firmware") + continue + # download firmware + try: + dl_path, header = urllib.request.urlretrieve(definition.url[to_flash]) + except: + print("could not download firmware " + definition.url[to_flash]) + continue + dl_file = open(dl_path, "rb") + dl_data = dl_file.read() + dl_file.close() + # compare versions + dl_version = re.search(b'firmware \d+\.\d+\.\d+\.\d+-[0-9a-fA-F]{4}', dl_data) + if dl_version is None: + print("could not get version from downloaded firmware image") + os.remove(dl_path) + continue + dl_version = dl_version.group(0).decode("utf-8").split(" ")[1] + print("latest firmware version: " + dl_version) + versions = list(map(lambda x: int(x), version.split(" ")[-1].split("-")[0].split("."))) + dl_versions = list(map(lambda x: int(x), dl_version.split("-")[0].split("."))) + dl_newer = (versions[0] < dl_versions[0] or (versions[0] == dl_versions[0] and versions[1] < dl_versions[1]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] < dl_versions[2]) or (versions[0] == dl_versions[0] and versions[1] == dl_versions[1] and versions[2] == dl_versions[2] and versions[3] < dl_versions[3])) + if not dl_newer: + print("no need to flash latest version") + os.remove(dl_path) + continue + print("flashing latest version") + dfu_result = subprocess.run(["dfu-util", "--device", hex(definition.usb_vendor_id) + ":" + hex(definition.usb_product_id), "--path", usb_path, "--cfg", "1", "--alt", "1", "--reset", "--download", dl_path]) + os.remove(dl_path) + if 0 != dfu_result.returncode: + printf("flashing firmware using dfu-util failed. ensure dfu-util is installed and you have the permissions to access this USB device") + continue + updated_nb += 1 + +print(str(devices_nb)+ " SIMtrace 2 device(s) found") +print(str(updated_nb)+ " SIMtrace 2 device(s) updated") -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ebe0f54b6e3b7b45478603cc0a5b56e87b1f461 Gerrit-Change-Number: 16874 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 07:18:42 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 07:18:42 +0000 Subject: Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Depends: osmo-ci d299ca1ec8ba1c1483264479136f45dbb0845c75 Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/03/16903/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 07:57:39 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 07:57:39 +0000 Subject: Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 --- A contrib/jenkins.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/03/16903/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 07:58:56 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 07:58:56 +0000 Subject: Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/03/16903/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:00:21 +0000 Subject: Change in osmo-ci[master]: gerrit-verification: fix erlang cmd References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 ) Change subject: gerrit-verification: fix erlang cmd ...................................................................... gerrit-verification: fix erlang cmd Jenkins job builder only does one pass of variable substitution. Replace the cmd_erlang variable with its contents, so the jobs don't fail with: [osmocom-gerrit-debian9] $ /bin/sh -xe /tmp/jenkins7189809471369692535.sh + {docker_run} {docker_img_erlang} /build/contrib/jenkins.sh /tmp/jenkins7189809471369692535.sh: 2: /tmp/jenkins7189809471369692535.sh: {docker_run}: not found Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2 ("jobs/gerrit-verifications.yml: add erlang repos") Related: OS#4345 Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/04/16904/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 8846e31..5703bf8 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -43,7 +43,6 @@ docker_img: '$USER/debian-stretch-jenkins' docker_img_erlang: '$USER/debian-buster-erlang' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' - cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' @@ -114,7 +113,7 @@ - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-ggsn: a1_name: GTP @@ -135,7 +134,7 @@ - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-hlr - osmo-iuh @@ -232,7 +231,7 @@ - ss7: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 Gerrit-Change-Number: 16904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:00:56 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:00:56 +0000 Subject: Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/05/16905/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:01:53 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:01:53 +0000 Subject: Change in ...osmo_dia2gsup[master]: contrib/jenkins.sh: new file References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/06/16906/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 Gerrit-Change-Number: 16906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:06:27 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:06:27 +0000 Subject: Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/05/16905/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:09:03 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:09:03 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... gerrit-verifications: fix erlang/osmo_ss7 name Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2 ("jobs/gerrit-verifications.yml: add erlang repos") Related: OS#4345 Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 --- M jobs/gerrit-verifications.yml 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/07/16907/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5703bf8..80a3b08 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -198,6 +198,11 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} /build/contrib/jenkins.sh + - osmo_ss7: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' + - osmo-sip-connector - osmo-trx: @@ -228,11 +233,6 @@ concurrent: false cmd: './contrib/jenkins.sh' - - ss7: - repos_url: '{gerrit_url}/erlang/{repos}' - gerrit_project: 'erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' slave_axis: !!python/tuple [ttcn3] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:21:10 +0000 Subject: Change in osmo-ci[master]: gerrit-verification: fix erlang cmd In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 ) Change subject: gerrit-verification: fix erlang cmd ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 Gerrit-Change-Number: 16904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 08:21:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 08:21:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 08:21:16 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 08:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 09:32:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 09:32:31 +0000 Subject: Change in simtrace2[master]: host: Add COPYING file for host software (GPLv2) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16908 ) Change subject: host: Add COPYING file for host software (GPLv2) ...................................................................... host: Add COPYING file for host software (GPLv2) Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa --- A host/COPYING 1 file changed, 339 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/08/16908/1 diff --git a/host/COPYING b/host/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/host/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa Gerrit-Change-Number: 16908 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 09:32:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 09:32:32 +0000 Subject: Change in simtrace2[master]: host/lib/gsmtap.c: Add GPLv2 disclaimer References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16909 ) Change subject: host/lib/gsmtap.c: Add GPLv2 disclaimer ...................................................................... host/lib/gsmtap.c: Add GPLv2 disclaimer Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2 --- M host/lib/gsmtap.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/09/16909/1 diff --git a/host/lib/gsmtap.c b/host/lib/gsmtap.c index 103f2fc..18814d3 100644 --- a/host/lib/gsmtap.c +++ b/host/lib/gsmtap.c @@ -1,3 +1,22 @@ +/* gsmtap - How to encapsulate SIM protocol traces in GSMTAP + * + * (C) 2016-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #include #include -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2 Gerrit-Change-Number: 16909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 09:32:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 09:32:32 +0000 Subject: Change in simtrace2[master]: HACK: Solve weird problem wih lost OUT transfer on ping-pong endpoint References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16910 ) Change subject: HACK: Solve weird problem wih lost OUT transfer on ping-pong endpoint ...................................................................... HACK: Solve weird problem wih lost OUT transfer on ping-pong endpoint This adds an unconditional endpoint reset procedure to every SET_FEATURE(UnHalt). It doesn't really make sense that this is required, *particularly* as we *MUST NOT* set bEndpoint->bank to 0 here. Without this patch, I'm observing the following problem: Every first OUT transfer after a SET_INTERFACE + UNHALT on a bulk endpoint is lost. "lost" means that it completes successfully on the host, can be seen completing successfully with an ACK on a USB bus analyzer, but still doesn't show up in the firmware. No Endpoint Interrupt is generated. This can be reproduced by calling libusb_set_interface_alt_setting() from the host and then submitting a single OUT transfer. Change-Id: I18ed530e617baddf76e8f9829512443ce2a76e0d --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/10/16910/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 1ebab5b..e6edda6 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1672,6 +1672,10 @@ UDP->UDP_RST_EP |= 1 << bEndpoint; UDP->UDP_RST_EP &= ~(1 << bEndpoint); } + + /* This fixes a weird bug with regard to ping-pong OUT endpoints */ + UDP->UDP_RST_EP |= 1 << bEndpoint; + UDP->UDP_RST_EP &= ~(1 << bEndpoint); } /* Return Halt status */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I18ed530e617baddf76e8f9829512443ce2a76e0d Gerrit-Change-Number: 16910 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:00:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 10:00:06 +0000 Subject: Change in simtrace2[master]: host: Add COPYING file for host software (GPLv2) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16908 ) Change subject: host: Add COPYING file for host software (GPLv2) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa Gerrit-Change-Number: 16908 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 10:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:00:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 10:00:12 +0000 Subject: Change in simtrace2[master]: host/lib/gsmtap.c: Add GPLv2 disclaimer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16909 ) Change subject: host/lib/gsmtap.c: Add GPLv2 disclaimer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2 Gerrit-Change-Number: 16909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 10:00:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:00:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 10:00:15 +0000 Subject: Change in simtrace2[master]: host: Add COPYING file for host software (GPLv2) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16908 ) Change subject: host: Add COPYING file for host software (GPLv2) ...................................................................... host: Add COPYING file for host software (GPLv2) Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa --- A host/COPYING 1 file changed, 339 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/COPYING b/host/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/host/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0f89a204939b0648eed94cc4f6e7c4f735c118fa Gerrit-Change-Number: 16908 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:00:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 10:00:17 +0000 Subject: Change in simtrace2[master]: host/lib/gsmtap.c: Add GPLv2 disclaimer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16909 ) Change subject: host/lib/gsmtap.c: Add GPLv2 disclaimer ...................................................................... host/lib/gsmtap.c: Add GPLv2 disclaimer Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2 --- M host/lib/gsmtap.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/lib/gsmtap.c b/host/lib/gsmtap.c index 103f2fc..18814d3 100644 --- a/host/lib/gsmtap.c +++ b/host/lib/gsmtap.c @@ -1,3 +1,22 @@ +/* gsmtap - How to encapsulate SIM protocol traces in GSMTAP + * + * (C) 2016-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #include #include -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie163af869c6aa2f3e2bd9007432dc6945384aaf2 Gerrit-Change-Number: 16909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:01:12 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jan 2020 10:01:12 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 to look at the new patch set (#4). Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M .gitignore M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 773 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/16885/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jan 2020 10:01:58 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 4: (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/3/src/common/ta_control.c at 52 PS3, Line 52: LOGL_INFO > maybe switch this to DEBUG, as a non-changing TA is the default, and one might want to see only the [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/src/osmo-bts-trx/trx_vty.c at 196 PS2, Line 196: vty_out (vty, "'no osmotrx timing-advance-loop' is deprecated%s", VTY_NEWLINE); > I'd add some string telling the user that no extra operation is needed, TA loop will be enabled by d [?] Its now active by default. I can make it optional if there are any concerns but in the end its a standard feature of a BTS. https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c File tests/ta_control/ta_control_test.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c at 43 PS2, Line 43: for (i=0; i spacing i = 0; i < steps looks like I forgot to run lindent.sh https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c at 47 PS2, Line 47: > whitespace Done https://gerrit.osmocom.org/c/osmo-bts/+/16885/2/tests/ta_control/ta_control_test.c at 55 PS2, Line 55: > whitespace Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 10:01:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:09:35 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jan 2020 10:09:35 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: dexter has restored this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-MessageType: restore -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:10:06 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jan 2020 10:10:06 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 1: This was the wrong patch, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 10:10:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:10:39 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jan 2020 10:10:39 +0000 Subject: Change in libosmocore[master]: application.c: check default loglevels on startup In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16833 ) Change subject: application.c: check default loglevels on startup ...................................................................... Abandoned After all I think this patch was not the best Idea. Looking through the projects and correcting the loglevels if needed is better I think. Also I see that the print to stderr messes up some unit-tests. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d7e345c14a188430a0e991bfd9fb0343d05ea92 Gerrit-Change-Number: 16833 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:36:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 10:36:02 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c at a716 PS1, Line 716: LOGL_INFO What's wrong with having INFO by default? What is the point of this API (*.loglevel = LOGL_FOO) then if we set NOTICE evertwhere? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jan 2020 10:36:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:41:33 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:41:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter ...................................................................... hlr: f_perform_UL: add CnDomain parameter Make it possible to do CS location update, not only PS. This is needed for upcoming D-GSM related tests. Related: SYS#4618 Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/16911/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 50109a6..0c56bcd 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -436,7 +436,8 @@ } function f_perform_UL(hexstring imsi, template hexstring msisdn, - template (omit) integer exp_err_cause := omit) + template (omit) integer exp_err_cause := omit, + GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS) runs on HLR_ConnHdlr return GSUP_PDU { var GSUP_PDU ret; timer T := 3.0; @@ -446,7 +447,7 @@ exp_fail := true; } - GSUP.send(valueof(ts_GSUP_UL_REQ(imsi))); + GSUP.send(valueof(ts_GSUP_UL_REQ(imsi, dom))); T.start; alt { [exp_fail] GSUP.receive(tr_GSUP_UL_ERR(imsi, exp_err_cause)) -> value ret { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d4b1db1..d32b2f1 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -486,9 +486,9 @@ tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, { tr_GSUP_IE_IMSI(imsi), *, tr_GSUP_IE(OSMO_GSUP_AUTH_TUPLE_IE), * }); -template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi) := +template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi, GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS) := ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, { - valueof(ts_GSUP_IE_IMSI(imsi)) }); + valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_CnDomain(dom)) }); template GSUP_PDU tr_GSUP_UL_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, imsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 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: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:41:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... deps: add titan.ProtocolModules.DNS To be used in mslookup mDNS tests. Related: SYS#4618 Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/16912/1 diff --git a/deps/Makefile b/deps/Makefile index 5d263aa..4566eae 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -19,6 +19,7 @@ OSMOGIT:=git://git.osmocom.org ECLIPSEGIT_REPOS= titan.Libraries.TCCUsefulFunctions \ + titan.ProtocolModules.DNS \ titan.ProtocolModules.ICMP \ titan.ProtocolModules.ICMPv6 \ titan.ProtocolModules.IP \ @@ -81,6 +82,7 @@ titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A titan.ProtocolModules.BSSMAP_commit= master +titan.ProtocolModules.DNS_commit= R.7.B titan.ProtocolModules.GRE_commit= R.2.A titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:41:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/1 diff --git a/deps/Makefile b/deps/Makefile index 4566eae..35a5ee4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -39,7 +39,6 @@ titan.TestPorts.SIPmsg \ titan.TestPorts.TCPasp \ titan.TestPorts.TELNETasp \ - titan.TestPorts.UDPasp \ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ @@ -64,6 +63,7 @@ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.SGsAP_13.2.0 \ titan.TestPorts.MTP3asp \ + titan.TestPorts.UDPasp \ titan.ProtocolModules.M3UA \ titan.ProtocolEmulations.M3UA -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:41:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 271 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/1 diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg index 7416362..1ab6e87 100644 --- a/hlr/HLR_Tests.cfg +++ b/hlr/HLR_Tests.cfg @@ -12,6 +12,7 @@ [MODULE_PARAMETERS] +HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default index 84d4ff3..2e9aac6 100644 --- a/hlr/HLR_Tests.default +++ b/hlr/HLR_Tests.default @@ -11,6 +11,11 @@ *.VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.VTY.PROMPT1 := "OsmoHLR> " +*.mDNS_UDP.debugging := "YES" +*.mDNS_UDP.localPort := "4266" +*.mDNS_UDP.localIPAddr := "239.192.23.42" +*.mDNS_UDP.broadcast := "enabled" +*.mDNS_UDP.reuseAddr := "enabled" [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoHLR"; diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 0c56bcd..3e9f69a 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -31,6 +31,11 @@ import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; +import from DNS_Types all; +import from MSLookup_mDNS_Types all; +import from MSLookup_mDNS_Emulation all; +import from MSLookup_mDNS_Templates all; + type component test_CT extends CTRL_Adapter_CT { var IPA_Emulation_CT vc_IPA; var IPA_CCM_Parameters ccm_pars; @@ -43,6 +48,8 @@ port TELNETasp_PT VTY; + var MSLookup_mDNS_Emulation_CT vc_MSLookup_mDNS; + timer g_Tguard := 10.0; }; @@ -50,6 +57,9 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_gsup_port := 4222; integer mp_hlr_ctrl_port := 4259; + + /* Drop after osmo-hlr release > 1.2.0 */ + boolean mp_hlr_supports_dgsm := true; }; type record HlrSubscrAud2G { @@ -77,6 +87,7 @@ timer g_Tguard := 10.0; var HLR_ConnHdlrPars g_pars; port TELNETasp_PT VTY; + port MSLookup_mDNS_PT mDNS; } type record HLR_ConnHdlrPars { @@ -113,6 +124,9 @@ map(self:VTY, system:VTY); f_vty_set_prompts(VTY); f_vty_transceive(VTY, "enable"); + if (mp_hlr_supports_dgsm) { + f_vty_config(VTY, "mslookup", "no mdns bind"); + } } private altstep as_Tguard() runs on test_CT { @@ -164,6 +178,11 @@ } } +function f_init_mslookup() runs on test_CT { + vc_MSLookup_mDNS := MSLookup_mDNS_Emulation_CT.create; + vc_MSLookup_mDNS.start(MSLookup_mDNS_Emulation.f_main()); +} + function f_init(boolean legacy := true) runs on test_CT { /* activate default guard timer to ensure all tests eventually terminate */ @@ -172,6 +191,7 @@ f_init_gsup("HLR_Test", legacy); f_init_vty(); + f_init_mslookup(); f_ipa_ctrl_start(mp_hlr_ip, mp_hlr_ctrl_port); } @@ -183,6 +203,7 @@ vc_conn := HLR_ConnHdlr.create(id); connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); + connect(vc_conn:mDNS, vc_MSLookup_mDNS:mDNS); vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; @@ -1455,6 +1476,63 @@ vc_conn.done; } +/* Send an mslookup mDNS request to OsmoHLR and verify the answer */ +private function f_TC_MSLookup_mDNS_server() runs on HLR_ConnHdlr { + timer T; + var MSLookup_mDNS vl_rmsg; + var integer id := f_rnd_int(65535); /* mDNS packet ID */ + var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9); + var charstring domain := "sip.voice." & hex2str(msisdn) & ".msisdn.mdns.osmocom.org"; + + /* Create subscriber */ + g_pars.sub.msisdn := msisdn; + f_vty_subscr_create(VTY, g_pars.sub); + + /* Send mDNS query, expect timeout */ + mDNS.send(t_MSLookup_mDNS_query(id, domain)); + T.start(1.0); + alt { + [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, '42424242'O, 5060)) { + setverdict(fail, "OsmoHLR answered to mDNS query before subscriber did LU"); + } + [] mDNS.receive(MSLookup_mDNS:?) -> value vl_rmsg { + repeat; + } + [] T.timeout { + } + } + + /* Location update */ + f_perform_UL(g_pars.sub.imsi, msisdn, dom := OSMO_GSUP_CN_DOMAIN_CS); + + /* Send mDNS query again, expect result */ + mDNS.send(t_MSLookup_mDNS_query(id, domain)); + T.start(1.0); + alt { + [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, '42424242'O, 5060)) { + setverdict(pass); + } + [] mDNS.receive(MSLookup_mDNS:?) -> value vl_rmsg { + repeat; + } + [] T.timeout { + setverdict(fail, "OsmoHLR did not answer to mDNS query"); + } + } +} +testcase TC_MSLookup_mDNS_server() runs on test_CT { + var hexstring imsi := f_rnd_imsi('26242'H); + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi)); + + f_init(false); + f_vty_config(VTY, "mslookup", "mdns bind"); + f_vty_config2(VTY, {"mslookup", "server"}, "service sip.voice at 66.66.66.66 5060"); + + vc_conn := f_start_handler(refers(f_TC_MSLookup_mDNS_server), pars); + vc_conn.done; +} + /* TODO: * UL with ISD error * UL with ISD timeout @@ -1499,6 +1577,10 @@ execute( TC_subscr_create_on_demand_check_imei_early() ); execute( TC_subscr_create_on_demand_ul() ); execute( TC_subscr_create_on_demand_sai() ); + + if (mp_hlr_supports_dgsm) { + execute( TC_MSLookup_mDNS_server() ); + } }; }; diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 872820d..14a3f8d 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -35,11 +35,20 @@ FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.DNS/src +FILES="DNS_EncDec.cc DNS_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.UDPasp/src +FILES="UDPasp_PT.cc UDPasp_PT.hh UDPasp_PortType.ttcn UDPasp_Types.ttcn" +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " +FILES+="MSLookup_mDNS_Types.ttcn MSLookup_mDNS_Emulation.ttcn MSLookup_mDNS_Templates.ttcn" gen_links $DIR $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 1a1d812..14b05da 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -2,7 +2,7 @@ MAIN="HLR_Tests.ttcn" -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc SS_EncDec.cc MAP_EncDec.cc *.asn" +FILES="*.ttcn *.ttcnpp DNS_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc UDPasp_PT.cc SS_EncDec.cc MAP_EncDec.cc *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" diff --git a/library/MSLookup_mDNS_Emulation.ttcn b/library/MSLookup_mDNS_Emulation.ttcn new file mode 100644 index 0000000..a1aa4e3 --- /dev/null +++ b/library/MSLookup_mDNS_Emulation.ttcn @@ -0,0 +1,43 @@ +module MSLookup_mDNS_Emulation { + +/* (C) 2020 sysmocom s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DNS_Types all; +import from UDPasp_Types all; +import from UDPasp_PortType all; +import from MSLookup_mDNS_Types all; + +function f_main() runs on MSLookup_mDNS_Emulation_CT +{ + var MSLookup_mDNS vl_dnsmsg; + var ASP_UDP vl_udpmsg; + map(self:mDNS_UDP, system:UDP); + alt { + [] mDNS_UDP.receive(ASP_UDP:?) -> value vl_udpmsg { + mDNS.send(MSLookup_mDNS: { + dec_PDU_DNS(vl_udpmsg.data), + vl_udpmsg.addressf, + vl_udpmsg.portf + }); + repeat; + } + [] mDNS.receive(MSLookup_mDNS:?) -> value vl_dnsmsg { + mDNS_UDP.send(ASP_UDP: { + enc_PDU_DNS(vl_dnsmsg.dnsMessage, false, true), + vl_dnsmsg.udpAddress, + vl_dnsmsg.udpPort + }); + repeat; + } + } + unmap(self:mDNS_UDP, system:UDP); +} + +} diff --git a/library/MSLookup_mDNS_Templates.ttcn b/library/MSLookup_mDNS_Templates.ttcn new file mode 100644 index 0000000..dd408c5 --- /dev/null +++ b/library/MSLookup_mDNS_Templates.ttcn @@ -0,0 +1,99 @@ + +/* (C) 2020 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module MSLookup_mDNS_Templates { + +import from DNS_Types all; +import from MSLookup_mDNS_Types all; + +template MSLookup_mDNS t_MSLookup_mDNS_query(integer id, charstring domain) := { + dnsMessage := { + header := { + id := id, + qr := DNS_QUERY, + opCode := 0, + aa := false, + tc := false, + rd := false, + ra := false, + z := '000'B, + rCode := DNS_NO_ERROR, + qdCount := 1, + anCount := 0, + nsCount := 0, + arCount := 0 + }, + queries := { + { + qName := domain, + qType := 255, + qClass := DNS_IN + } + }, + answers := {}, + nameServerRecords := {}, + additionalRecords := {} + }, + udpAddress := "239.192.23.42", + udpPort := 4266 +} + +template MSLookup_mDNS tr_MSLookup_mDNS_result_IPv4(integer id, charstring domain, UInt32 ip_v4, integer port_v4) := { + dnsMessage := { + header := { + id := id, + qr := DNS_RESPONSE, + opCode := DNS_OP_QUERY, + aa := false, + tc := false, + rd := false, + ra := false, + z := '000'B, + rCode := DNS_NO_ERROR, + qdCount := 0, + anCount := 3, + nsCount := 0, + arCount := 0 + }, + queries := {}, + answers := { + { + name := domain, + rrType := DNS_TXT, + rrClass := DNS_IN, + ttl := ?, + rdLength := ?, + rData := {txt := {pattern "age=*"}} + }, + { + name := domain, + rrType := DNS_A, + rrClass := DNS_IN, + ttl := ?, + rdLength := ?, + rData := {a := ip_v4} + }, + { + name := domain, + rrType := DNS_TXT, + rrClass := DNS_IN, + ttl := ?, + rdLength := ?, + rData := {txt := {"port=" & int2str(port_v4)}} + } + }, + nameServerRecords := {}, + additionalRecords := {} + }, + udpAddress := ?, + udpPort := ? +} + +} diff --git a/library/MSLookup_mDNS_Types.ttcn b/library/MSLookup_mDNS_Types.ttcn new file mode 100644 index 0000000..dacbb2b --- /dev/null +++ b/library/MSLookup_mDNS_Types.ttcn @@ -0,0 +1,31 @@ +module MSLookup_mDNS_Types { + +/* (C) 2020 sysmocom s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from DNS_Types all; +import from UDPasp_Types all; +import from UDPasp_PortType all; + +type record MSLookup_mDNS { + PDU_DNS dnsMessage, + AddressType udpAddress, + PortType udpPort +} + +type port MSLookup_mDNS_PT message { + inout MSLookup_mDNS +} with { extension "internal" } + +type component MSLookup_mDNS_Emulation_CT { + port MSLookup_mDNS_PT mDNS; + port UDPasp_PT mDNS_UDP; +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:41:54 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:41:54 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr-test: set mp_hlr_supports_dgsm References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16915 ) Change subject: ttcn3-hlr-test: set mp_hlr_supports_dgsm ...................................................................... ttcn3-hlr-test: set mp_hlr_supports_dgsm Related: SYS#4618 Depends: osmo-ttcn3-hacks Ia7f92d33691f910549353b16a7b0efc18e521719 Change-Id: Iafdf267c6012264966857e41e855fa971f773023 --- M ttcn3-hlr-test/HLR_Tests.cfg M ttcn3-hlr-test/jenkins.sh 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/16915/1 diff --git a/ttcn3-hlr-test/HLR_Tests.cfg b/ttcn3-hlr-test/HLR_Tests.cfg index b8aa886..9258cea 100644 --- a/ttcn3-hlr-test/HLR_Tests.cfg +++ b/ttcn3-hlr-test/HLR_Tests.cfg @@ -9,6 +9,7 @@ [MODULE_PARAMETERS] HLR_Tests.mp_hlr_ip := "172.18.10.20" +HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 2bf1f98..74aa37f 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -13,6 +13,12 @@ mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ +# Disable D-GSM tests until osmo-hlr.git release > 1.2.0 is available +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/HLR_Tests.mp_hlr_supports_dgsm := true/HLR_Tests.mp_hlr_supports_dgsm := false/g" -i \ + "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iafdf267c6012264966857e41e855fa971f773023 Gerrit-Change-Number: 16915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:54:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:54:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 to look at the new patch set (#2). Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... deps: add titan.ProtocolModules.DNS To be used in mslookup mDNS tests. Related: SYS#4618 Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/16912/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:54:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:54:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 to look at the new patch set (#2). Change subject: deps: use UDPasp from osmocom github fork ...................................................................... deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:54:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:54:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#2). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:56:00 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:56:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#3). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 271 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 10:59:10 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 10:59:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#4). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 269 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:08:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:08:02 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16885/4/src/common/ta_control.c File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/16885/4/src/common/ta_control.c at 30 PS4, Line 30: #define TOA256_MAX 63 AFAIU that's not TOA256, but TOA. TOA256_MAX would be 63*256, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:08:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:08:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:08:33 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 12:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:10:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:10:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 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: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:10:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:10:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:10:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:11:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:11:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:11:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:16:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:16:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn at 16 PS4, Line 16: function f_main() runs on MSLookup_mDNS_Emulation_CT What's this doing exactly? I'd welcome some comment above explaining it a bit. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn at 36 PS4, Line 36: repeat; wrong indentation -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:16:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:23:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 12:23:57 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr-test: set mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16915 ) Change subject: ttcn3-hlr-test: set mp_hlr_supports_dgsm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iafdf267c6012264966857e41e855fa971f773023 Gerrit-Change-Number: 16915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:23:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:51:47 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 12:51:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#5). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:52:04 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 12:52:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn at 16 PS4, Line 16: function f_main() runs on MSLookup_mDNS_Emulation_CT > What's this doing exactly? I'd welcome some comment above explaining it a bit. Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/4/library/MSLookup_mDNS_Emulation.ttcn at 36 PS4, Line 36: repeat; > wrong indentation Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:52:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:55:25 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 12:55:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913/2/deps/Makefile File deps/Makefile: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913/2/deps/Makefile at a22 PS2, Line 22: titan.ProtocolModules.DNS \ resolving merge conflict went wrong, this should not have been removed. I'll prepare a fixed version. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 12:55:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 12:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 12:57:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 to look at the new patch set (#3). Change subject: deps: use UDPasp from osmocom github fork ...................................................................... deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/16913/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:04:03 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 13:04:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#7). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 272 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:19:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 13:19:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn at 16 PS7, Line 16: /* Transcode between mDNS and UDP: Fine, but TBH I'm still not understanding why is this required. What's the different between the "UDP packets" and the "DNS packets" you mention? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:19:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:19:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 13:19:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:19:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:41:37 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 13:41:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn File library/MSLookup_mDNS_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914/7/library/MSLookup_mDNS_Emulation.ttcn at 16 PS7, Line 16: /* Transcode between mDNS and UDP: > Fine, but TBH I'm still not understanding why is this required. [?] It might be possible that we could omit this file completely, and directly use dec_PDU_DNS and enc_PDU_DNS. I've adapted it from the other library/*_Emulation.ttcn files and from the demo code in titan.ProtocolModules.DNS. But then I'm not sure how we would specify the UDP port... In order to not spend too much time on this, I'd just keep it as-is, unless we have a good reason to refactor it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 13:41:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:42:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 13:42:11 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 to look at the new patch set (#2). Change subject: sccp: Add value_string for SCCP message types ...................................................................... sccp: Add value_string for SCCP message types Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc --- M include/osmocom/sccp/sccp_types.h M src/Makefile.am M src/sccp2sua.c A src/sccp_types.c 4 files changed, 36 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/16896/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 13:42:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 13:42:11 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 to look at the new patch set (#3). Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... sccp: Improve logging in sccp_to_xua_opt() Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c M src/sccp_types.c 3 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/01/16901/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:11:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 14:11:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Not a merge blocker, but might be a desirable feature. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn File library/GSUP_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn at 498 PS2, Line 498: GSUP_CnDomain dom Since this IE is optional, we should allow passing omit: template (omit) ts_GSUP_UL_REQ dom := omit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911/2/library/GSUP_Types.ttcn at 500 PS2, Line 500: valueof(ts_GSUP_IE_CnDomain(dom)) ... but handling optional IEs here is a bit complicated. You would need a function returning the list of IEs, because you cannot just pass omit to ts_GSUP_IE_CnDomain. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 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: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:11:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:12:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 14:12:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:12:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:13:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 14:13:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 14:13:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:20:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 14:20:22 +0000 Subject: Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 ) Change subject: sccp2sua.c: Log malformed SUA message ...................................................................... sccp2sua.c: Log malformed SUA message Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b --- M src/sccp2sua.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/16916/1 diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 2be27ea..92a3907 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1468,8 +1468,11 @@ goto out_err; } - if (rc < 0) + if (rc < 0) { + LOGP(DLSUA, LOGL_ERROR, "Malformed SUA message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); goto out_err; + } return msg; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b Gerrit-Change-Number: 16916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:53:46 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 14:53:46 +0000 Subject: Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync ...................................................................... osmocom-release-tarballs: publish with rsync Related: OS#3870 Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 --- M jobs/osmocom-release-tarballs.yml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/16917/1 diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 56f5777..fd078be 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -10,6 +10,8 @@ defaults: global description: | For each relevant Osmocom repository and its tags, build release tarballs (OS#3870). +

+ Publishes to: https://ftp.osmocom.org/releases parameters: - string: name: BRANCH_OSMO_CI @@ -33,6 +35,10 @@ -w /osmo-ci \ -e KEEP_TEMP="$KEEP_TEMP" \ "$USER/debian-stretch-build-dist" /osmo-ci/scripts/osmocom-release-tarballs.sh + + SSH_COMMAND="ssh -p 48" + cd _release_tarballs + rsync -avz --delete -e "$SSH_COMMAND" . releases at rita.osmocom.org:web-files/ scm: - git: branches: @@ -50,5 +56,9 @@ - email: notify-every-unstable-build: true recipients: 'jenkins-notifications at lists.osmocom.org' + wrappers: + - ssh-agent-credentials: + users: + - releases # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:54:24 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 14:54:24 +0000 Subject: Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync ...................................................................... Patch Set 1: Verified+1 Uploading works: https://ftp.osmocom.org/releases/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 14:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:54:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 14:54:52 +0000 Subject: Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 ) Change subject: sccp: Log missing user and router failure paths ...................................................................... sccp: Log missing user and router failure paths Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b --- M src/sccp_scoc.c M src/sccp_scrc.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/16918/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 7570764..b5b6547 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1364,6 +1364,9 @@ uint32_t conn_id; struct sccp_connection *conn; + LOGP(DLSCCP, LOGL_NOTICE, "SCRC Routing Failure for message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + /* try to dispatch to connection FSM (if any) */ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); conn = conn_find_by_id(inst, conn_id); diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index e259d7c..b46b4f2 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -321,6 +321,9 @@ /* Is subsystem equipped? */ if (!scu) { /* Error: unequipped user */ + LOGP(DLSCCP, LOGL_NOTICE, + "Unable to find user for SSN=%u PC=%s\n", + called->ssn, osmo_ss7_pointcode_print(inst->ss7, called->pc)); return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_UNEQUIPPED_USER); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b Gerrit-Change-Number: 16918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:28 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:33 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:40 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add value_string for SCCP message types In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 ) Change subject: sccp: Add value_string for SCCP message types ...................................................................... sccp: Add value_string for SCCP message types Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc --- M include/osmocom/sccp/sccp_types.h M src/Makefile.am M src/sccp2sua.c A src/sccp_types.c 4 files changed, 36 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 18b54f4..71cbb0f 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -26,6 +26,7 @@ #include #include +#include /* Table 1/Q.713 - SCCP message types */ enum sccp_message_types { @@ -51,6 +52,10 @@ SCCP_MSG_TYPE_LUDTS = 20 }; +extern const struct value_string osmo_sccp_msg_type_names[]; +static inline const char *osmo_sccp_msg_type_name(enum sccp_message_types val) +{ return get_value_string(osmo_sccp_msg_type_names, val); } + /* Table 2/Q.713 - SCCP parameter name codes */ enum sccp_parameter_name_codes { SCCP_PNC_END_OF_OPTIONAL = 0, diff --git a/src/Makefile.am b/src/Makefile.am index 4ef753c..484886c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c xua_rkm.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c xua_rkm.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/sccp2sua.c b/src/sccp2sua.c index f68f9a9..7e6b3a3 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1341,6 +1341,10 @@ case SCCP_MSG_TYPE_XUDTS: case SCCP_MSG_TYPE_LUDT: case SCCP_MSG_TYPE_LUDTS: + LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message %s\n", + osmo_sccp_msg_type_name(msg->l2h[0])); + xua_msg_free(xua); + return NULL; default: LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message type %u\n", msg->l2h[0]); diff --git a/src/sccp_types.c b/src/sccp_types.c new file mode 100644 index 0000000..c6e24cc --- /dev/null +++ b/src/sccp_types.c @@ -0,0 +1,26 @@ +#include + +/* Table 1/Q.713 - SCCP message types */ +const struct value_string osmo_sccp_msg_type_names[] = { + { SCCP_MSG_TYPE_CR, "Connection request" }, + { SCCP_MSG_TYPE_CC, "Connection confirm" }, + { SCCP_MSG_TYPE_CREF, "Connection refused" }, + { SCCP_MSG_TYPE_RLSD, "Released" }, + { SCCP_MSG_TYPE_RLC, "Release complete" }, + { SCCP_MSG_TYPE_DT1, "Data form 1" }, + { SCCP_MSG_TYPE_DT2, "Data form 2" }, + { SCCP_MSG_TYPE_AK, "Data acknowledgement" }, + { SCCP_MSG_TYPE_UDT, "Unitdata" }, + { SCCP_MSG_TYPE_UDTS, "Unitdata service" }, + { SCCP_MSG_TYPE_ED, "Expedited data" }, + { SCCP_MSG_TYPE_EA, "Expedited data acknowledgement" }, + { SCCP_MSG_TYPE_RSR, "Reset request" }, + { SCCP_MSG_TYPE_RSC, "Reset confirmation" }, + { SCCP_MSG_TYPE_ERR, "Protocol data unit error" }, + { SCCP_MSG_TYPE_IT, "Inactivity test" }, + { SCCP_MSG_TYPE_XUDT, "Extended unitdata" }, + { SCCP_MSG_TYPE_XUDTS, "Extended unitdata service" }, + { SCCP_MSG_TYPE_LUDT, "Long unitdata" }, + { SCCP_MSG_TYPE_LUDTS, "Long unitdata service" }, + {} +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibf3ee4be88a4ca633a01fad08d4c714bfa9008bc Gerrit-Change-Number: 16896 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:40 +0000 Subject: Change in libosmo-sccp[master]: sccp: Avoid memleak of xua_msg receiving malformed sccp message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 ) Change subject: sccp: Avoid memleak of xua_msg receiving malformed sccp message ...................................................................... sccp: Avoid memleak of xua_msg receiving malformed sccp message first, xua_msg is allocated internally in the function. Then depending on msg type different functions are called. All of those functions either return the same input xua msg pointer or NULL. If they return NULL due to parsing failure, we need to free the internally allocated xua pointer. Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c --- M src/sccp2sua.c 1 file changed, 49 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 7e6b3a3..1106888 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -998,6 +998,7 @@ local_ref->octet3 = tmp32 & 0xff; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cr(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_request *req = (struct sccp_connection_request *)msg->l2h; @@ -1013,6 +1014,7 @@ return sccp_to_xua_opt(msg, &req->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cr(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_request *req; @@ -1029,6 +1031,7 @@ return xua_ies_to_sccp_opts(msg, &req->optional_start, req->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_confirm *cnf = (struct sccp_connection_confirm *)msg->l2h; @@ -1041,6 +1044,7 @@ return sccp_to_xua_opt(msg, &cnf->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_confirm *cnf; @@ -1055,6 +1059,7 @@ return xua_ies_to_sccp_opts(msg, &cnf->optional_start, cnf->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_cref(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_refused *ref = (struct sccp_connection_refused *)msg->l2h; @@ -1066,6 +1071,7 @@ return sccp_to_xua_opt(msg, &ref->optional_start, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static int sua_to_sccp_cref(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_refused *ref; @@ -1079,6 +1085,7 @@ return xua_ies_to_sccp_opts(msg, &ref->optional_start, ref->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_rlsd(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_released *rlsd = (struct sccp_connection_released *)msg->l2h; @@ -1106,6 +1113,7 @@ return xua_ies_to_sccp_opts(msg, &rlsd->optional_start, rlsd->type, xua); } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_rlc(struct msgb *msg, struct xua_msg *xua) { struct sccp_connection_release_complete *rlc; @@ -1129,6 +1137,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_dt1(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_form1 *dt1 = (struct sccp_data_form1 *) msg->l2h; @@ -1157,6 +1166,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udt(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata *udt = (struct sccp_data_unitdata *)msg->l2h; @@ -1192,6 +1202,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; @@ -1228,6 +1239,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h; @@ -1261,6 +1273,7 @@ return 0; } +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_err(struct msgb *msg, struct xua_msg *xua) { struct sccp_proto_err *err = (struct sccp_proto_err *)msg->l2h; @@ -1302,34 +1315,54 @@ switch (msg->l2h[0]) { case SCCP_MSG_TYPE_CR: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE); - return sccp_to_xua_cr(msg, xua); + if (!sccp_to_xua_cr(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_CC: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK); - return sccp_to_xua_cc(msg, xua); + if (!sccp_to_xua_cc(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_CREF: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COREF); - return sccp_to_xua_cref(msg, xua); + if (!sccp_to_xua_cref(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_RLSD: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE); - return sccp_to_xua_rlsd(msg, xua); + if (!sccp_to_xua_rlsd(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_RLC: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO); - return sccp_to_xua_rlc(msg, xua); + if (!sccp_to_xua_rlc(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_DT1: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT); - return sccp_to_xua_dt1(msg, xua); + if (!sccp_to_xua_dt1(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_UDT: xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT); - return sccp_to_xua_udt(msg, xua); + if (!sccp_to_xua_udt(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_UDTS: xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDR); - return sccp_to_xua_udts(msg, xua); + if (!sccp_to_xua_udts(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_IT: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COIT); - return sccp_to_xua_it(msg, xua); + if (!sccp_to_xua_it(msg, xua)) + goto malformed; + return xua; case SCCP_MSG_TYPE_ERR: xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COERR); - return sccp_to_xua_err(msg, xua); + if (!sccp_to_xua_err(msg, xua)) + goto malformed; + return xua; /* Unsupported Message Types */ case SCCP_MSG_TYPE_DT2: case SCCP_MSG_TYPE_AK: @@ -1353,6 +1386,12 @@ } return NULL; + +malformed: + LOGP(DLSUA, LOGL_ERROR, "Malformed SCCP message %s\n", + osmo_sccp_msg_type_name(msg->l2h[0])); + xua_msg_free(xua); + return NULL; } /*! \brief convert parsed SUA message to SCCP message -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4189fbd66e7e05ce466b3e716a357c56d788b64c Gerrit-Change-Number: 16897 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:41 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server.c: Fix typo in log message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 ) Change subject: examples/sccp_test_server.c: Fix typo in log message ...................................................................... examples/sccp_test_server.c: Fix typo in log message Change-Id: I8456893b77624402645728ce9403847065a662eb --- M examples/sccp_test_server.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 6249e45..a66cb21 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -87,7 +87,7 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: N-UNITDATA.ind: Connectiong back to sender\n", __func__); + printf("%s: N-UNITDATA.ind: Connecting back to sender\n", __func__); osmo_sccp_tx_conn_req(scu, conn_id++, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8456893b77624402645728ce9403847065a662eb Gerrit-Change-Number: 16898 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:41 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: log category name instead of its hex value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 ) Change subject: examples/sccp_demo_user: log category name instead of its hex value ...................................................................... examples/sccp_demo_user: log category name instead of its hex value Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 --- M examples/sccp_demo_user.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 4b7b6bc..8cf3c33 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -72,6 +72,8 @@ void *tall_ctx = talloc_named_const(NULL, 1, "example"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); + log_set_print_category(osmo_stderr_target, true); + log_set_print_category_hex(osmo_stderr_target, false); for (i = 0; i < ARRAY_SIZE(log_cats); i++) log_set_category_filter(osmo_stderr_target, log_cats[i], 1, LOGL_DEBUG); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I57afb4cacdb3c118c7570d924caa23144d192aa8 Gerrit-Change-Number: 16899 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:58:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:58:58 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 ) Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:58:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:59:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:59:11 +0000 Subject: Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 ) Change subject: sccp2sua.c: Log malformed SUA message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b Gerrit-Change-Number: 16916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:59:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:59:29 +0000 Subject: Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 ) Change subject: sccp: Log missing user and router failure paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b Gerrit-Change-Number: 16918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:59:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:59:46 +0000 Subject: Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 14:59:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 14:59:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 14:59:47 +0000 Subject: Change in osmo-ci[master]: osmocom-release-tarballs: publish with rsync In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16917 ) Change subject: osmocom-release-tarballs: publish with rsync ...................................................................... osmocom-release-tarballs: publish with rsync Related: OS#3870 Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 --- M jobs/osmocom-release-tarballs.yml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 56f5777..fd078be 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -10,6 +10,8 @@ defaults: global description: | For each relevant Osmocom repository and its tags, build release tarballs (OS#3870). +

+ Publishes to: https://ftp.osmocom.org/releases parameters: - string: name: BRANCH_OSMO_CI @@ -33,6 +35,10 @@ -w /osmo-ci \ -e KEEP_TEMP="$KEEP_TEMP" \ "$USER/debian-stretch-build-dist" /osmo-ci/scripts/osmocom-release-tarballs.sh + + SSH_COMMAND="ssh -p 48" + cd _release_tarballs + rsync -avz --delete -e "$SSH_COMMAND" . releases at rita.osmocom.org:web-files/ scm: - git: branches: @@ -50,5 +56,9 @@ - email: notify-every-unstable-build: true recipients: 'jenkins-notifications at lists.osmocom.org' + wrappers: + - ssh-agent-credentials: + users: + - releases # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f88ae0c483ed03c42c47d1cd207ac2722cfa083 Gerrit-Change-Number: 16917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:02:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:02:37 +0000 Subject: Change in ...osmo_dia2gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 ) Change subject: contrib/jenkins.sh: new file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 Gerrit-Change-Number: 16906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:02:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:02:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:02:40 +0000 Subject: Change in ...osmo_dia2gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/16906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I688b71271fe80b4ec05304e9ed8abc8707cb7b58 Gerrit-Change-Number: 16906 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:03:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:03:07 +0000 Subject: Change in osmo-ci[master]: gerrit-verification: fix erlang cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 ) Change subject: gerrit-verification: fix erlang cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 Gerrit-Change-Number: 16904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:03:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:03:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:03:08 +0000 Subject: Change in osmo-ci[master]: gerrit-verification: fix erlang cmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 ) Change subject: gerrit-verification: fix erlang cmd ...................................................................... gerrit-verification: fix erlang cmd Jenkins job builder only does one pass of variable substitution. Replace the cmd_erlang variable with its contents, so the jobs don't fail with: [osmocom-gerrit-debian9] $ /bin/sh -xe /tmp/jenkins7189809471369692535.sh + {docker_run} {docker_img_erlang} /build/contrib/jenkins.sh /tmp/jenkins7189809471369692535.sh: 2: /tmp/jenkins7189809471369692535.sh: {docker_run}: not found Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2 ("jobs/gerrit-verifications.yml: add erlang repos") Related: OS#4345 Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 8846e31..5703bf8 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -43,7 +43,6 @@ docker_img: '$USER/debian-stretch-jenkins' docker_img_erlang: '$USER/debian-buster-erlang' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' - cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins at gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' gerrit_project: '{repos}' @@ -114,7 +113,7 @@ - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-ggsn: a1_name: GTP @@ -135,7 +134,7 @@ - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-hlr - osmo-iuh @@ -232,7 +231,7 @@ - ss7: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{cmd_erlang}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68 Gerrit-Change-Number: 16904 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:12:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 15:12:21 +0000 Subject: Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 ) Change subject: sccp: Convert ifelse to switch statement ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 Gerrit-Change-Number: 16900 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 15:12:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:14:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 15:14:13 +0000 Subject: Change in libosmo-sccp[master]: sccp: Convert ifelse to switch statement In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 ) Change subject: sccp: Convert ifelse to switch statement ...................................................................... sccp: Convert ifelse to switch statement Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 --- M src/sccp2sua.c 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 1106888..e68662f 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -712,13 +712,14 @@ oneopt = opt_start; while (oneopt < msg->tail) { - uint8_t opt_type = oneopt[0]; + enum sccp_parameter_name_codes opt_type = oneopt[0]; + uint8_t opt_len; + uint16_t opt_len16; - if (opt_type == SCCP_PNC_END_OF_OPTIONAL) + switch (opt_type) { + case SCCP_PNC_END_OF_OPTIONAL: return xua; - - if (opt_type == SCCP_PNC_LONG_DATA) { - uint16_t opt_len16; + case SCCP_PNC_LONG_DATA: /* two byte length field */ if (oneopt + 2 > msg->tail) return NULL; @@ -727,8 +728,8 @@ return NULL; xua_msg_add_sccp_opt(xua, opt_type, opt_len16, oneopt+3); oneopt += 3 + opt_len16; - } else { - uint8_t opt_len; + break; + default: /* one byte length field */ if (oneopt + 1 > msg->tail) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1f3129f5b949fc70913e8103ef17c696002b8ed2 Gerrit-Change-Number: 16900 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:14:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 15:14:13 +0000 Subject: Change in libosmo-sccp[master]: sccp: Improve logging in sccp_to_xua_opt() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 ) Change subject: sccp: Improve logging in sccp_to_xua_opt() ...................................................................... sccp: Improve logging in sccp_to_xua_opt() Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c M src/sccp_types.c 3 files changed, 40 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 71cbb0f..f43f822 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -80,6 +80,10 @@ SCCP_PNC_LONG_DATA = 19, }; +extern const struct value_string osmo_sccp_pnc_names[]; +static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val) +{ return get_value_string(osmo_sccp_pnc_names, val); } + /* Figure 3/Q.713 Called/calling party address */ enum { SCCP_TITLE_IND_NONE = 0, diff --git a/src/sccp2sua.c b/src/sccp2sua.c index e68662f..b829cf6 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -711,10 +711,11 @@ oneopt = opt_start; + enum sccp_parameter_name_codes opt_type = 0; /* dummy value not used */ while (oneopt < msg->tail) { - enum sccp_parameter_name_codes opt_type = oneopt[0]; uint8_t opt_len; uint16_t opt_len16; + opt_type = oneopt[0]; switch (opt_type) { case SCCP_PNC_END_OF_OPTIONAL: @@ -722,25 +723,30 @@ case SCCP_PNC_LONG_DATA: /* two byte length field */ if (oneopt + 2 > msg->tail) - return NULL; + goto malformed; opt_len16 = oneopt[1] << 8 | oneopt[2]; if (oneopt + 3 + opt_len16 > msg->tail) - return NULL; + goto malformed; xua_msg_add_sccp_opt(xua, opt_type, opt_len16, oneopt+3); oneopt += 3 + opt_len16; break; default: /* one byte length field */ if (oneopt + 1 > msg->tail) - return NULL; + goto malformed; opt_len = oneopt[1]; if (oneopt + 2 + opt_len > msg->tail) - return NULL; + goto malformed; xua_msg_add_sccp_opt(xua, opt_type, opt_len, oneopt+2); oneopt += 2 + opt_len; } } + LOGP(DLSUA, LOGL_ERROR, "Parameter %s not found\n", osmo_sccp_pnc_name(SCCP_PNC_END_OF_OPTIONAL)); + return NULL; + +malformed: + LOGP(DLSUA, LOGL_ERROR, "Malformed parameter %s (%d)\n", osmo_sccp_pnc_name(opt_type), opt_type); return NULL; } diff --git a/src/sccp_types.c b/src/sccp_types.c index c6e24cc..98b3fa4 100644 --- a/src/sccp_types.c +++ b/src/sccp_types.c @@ -24,3 +24,28 @@ { SCCP_MSG_TYPE_LUDTS, "Long unitdata service" }, {} }; + +/* Table 2/Q.713 - SCCP parameter name codes */ +const struct value_string osmo_sccp_pnc_names[] = { + { SCCP_PNC_END_OF_OPTIONAL, "End of optional parameters" }, + { SCCP_PNC_DESTINATION_LOCAL_REFERENCE, "Destination local reference" }, + { SCCP_PNC_SOURCE_LOCAL_REFERENCE, "Source local reference" }, + { SCCP_PNC_CALLED_PARTY_ADDRESS, "Called party address" }, + { SCCP_PNC_CALLING_PARTY_ADDRESS, "Calling party address" }, + { SCCP_PNC_PROTOCOL_CLASS, "Protocol class" }, + { SCCP_PNC_SEGMENTING, "Segmenting/reassembling" }, + { SCCP_PNC_RECEIVE_SEQ_NUMBER, "Receive sequence number" }, + { SCCP_PNC_SEQUENCING, "Sequencing/segmenting" }, + { SCCP_PNC_CREDIT, "Credit" }, + { SCCP_PNC_RELEASE_CAUSE, "Release cause" }, + { SCCP_PNC_RETURN_CAUSE, "Return cause" }, + { SCCP_PNC_RESET_CAUSE, "Reset cause" }, + { SCCP_PNC_ERROR_CAUSE, "Error cause" }, + { SCCP_PNC_REFUSAL_CAUSE, "Refusal cause" }, + { SCCP_PNC_DATA, "Data" }, + { SCCP_PNC_SEGMENTATION, "Segmentation" }, + { SCCP_PNC_HOP_COUNTER, "Hop counter" }, + { SCCP_PNC_IMPORTANCE, "Importance" }, + { SCCP_PNC_LONG_DATA, "Long data" }, + {} +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icb3f18f34ecfe0602c6e491b61107a30287dcafb Gerrit-Change-Number: 16901 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:19:36 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 15:19:36 +0000 Subject: Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 15:19:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:20:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:20:34 +0000 Subject: Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:20:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:20:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:20:36 +0000 Subject: Change in ...osmo_ss7[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/16905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: Ib20eb2e6d18a5b91ba3f042a70acb132256e9d26 Gerrit-Change-Number: 16905 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:20:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:20:41 +0000 Subject: Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 ) Change subject: contrib/jenkins.sh: new file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:20:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:20:44 +0000 Subject: Change in ...osmo_gsup[master]: contrib/jenkins.sh: new file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#4345 Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifa6c846ec002ad748185ba5da7108a67a9367786 Gerrit-Change-Number: 16903 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:21:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:21:16 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jan 2020 15:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:22:41 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 15:22:41 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... Patch Set 2: Verified+1 rebased on master to fix the "merge conflict" that gerrit showed -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:22:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:23:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 15:23:14 +0000 Subject: Change in libosmo-sccp[master]: sccp: Support receiving messages with no optional params In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 ) Change subject: sccp: Support receiving messages with no optional params ...................................................................... sccp: Support receiving messages with no optional params Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 --- M src/sccp2sua.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sccp2sua.c b/src/sccp2sua.c index b829cf6..2be27ea 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -705,6 +705,12 @@ /* some bounds checking */ if (ptr_opt < msg->data || ptr_opt > msg->tail) return NULL; + + /* Q.713 section 2.3 "Coding of pointers": pointer value all zeros used + to indicate that no optional param is present. */ + if (*ptr_opt == 0) + return xua; + opt_start = ptr_opt + *ptr_opt; if (opt_start > msg->tail) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I745bd32c62763ba2d88e74de8644c171ef506b37 Gerrit-Change-Number: 16902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:23:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 15:23:15 +0000 Subject: Change in libosmo-sccp[master]: sccp2sua.c: Log malformed SUA message In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 ) Change subject: sccp2sua.c: Log malformed SUA message ...................................................................... sccp2sua.c: Log malformed SUA message Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b --- M src/sccp2sua.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp2sua.c b/src/sccp2sua.c index 2be27ea..92a3907 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1468,8 +1468,11 @@ goto out_err; } - if (rc < 0) + if (rc < 0) { + LOGP(DLSUA, LOGL_ERROR, "Malformed SUA message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); goto out_err; + } return msg; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie04371d27426011e1a1a4f9136e0b28bf33df03b Gerrit-Change-Number: 16916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:23:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 15:23:15 +0000 Subject: Change in libosmo-sccp[master]: sccp: Log missing user and router failure paths In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 ) Change subject: sccp: Log missing user and router failure paths ...................................................................... sccp: Log missing user and router failure paths Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b --- M src/sccp_scoc.c M src/sccp_scrc.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 7570764..b5b6547 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1364,6 +1364,9 @@ uint32_t conn_id; struct sccp_connection *conn; + LOGP(DLSCCP, LOGL_NOTICE, "SCRC Routing Failure for message %s\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + /* try to dispatch to connection FSM (if any) */ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); conn = conn_find_by_id(inst, conn_id); diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index e259d7c..b46b4f2 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -321,6 +321,9 @@ /* Is subsystem equipped? */ if (!scu) { /* Error: unequipped user */ + LOGP(DLSCCP, LOGL_NOTICE, + "Unable to find user for SSN=%u PC=%s\n", + called->ssn, osmo_ss7_pointcode_print(inst->ss7, called->pc)); return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_UNEQUIPPED_USER); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I36374e4419474c5ab43c9cca1b59f3054f93180b Gerrit-Change-Number: 16918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:23:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:23:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 ) Change subject: MSC: fix TC_iu_cmserv_imsi_unknown: do not call f_mm_auth() ...................................................................... Patch Set 1: I think the problem is that somebody modified the test beyond what it originally intended to do. As the comment states, it is about an "IMSI that has never performed a LU before" (i.e. IMSI unknown to the VLR). It doesn't state that this IMSI is unknown to the HLR and hence should be rejected. That probably also explains the commented-out LU accept line in the test... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16889 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: I26fe18093e49bc9f53ac0234338c2b5cf9e4f07c Gerrit-Change-Number: 16889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:23:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:25:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:25:21 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_matching_dev_{path, serial} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16830 ) Change subject: usb: Add osmo_libusb_find_matching_dev_{path,serial} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93 Gerrit-Change-Number: 16830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 15:25:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:25:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:25:22 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_matching_dev_{path, serial} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16830 ) Change subject: usb: Add osmo_libusb_find_matching_dev_{path,serial} ...................................................................... usb: Add osmo_libusb_find_matching_dev_{path,serial} Thise two helper functions allow the user application to find a unique match among the existing USB devices, using either a user- provided iSerial string, or a user-provided physical USB path. Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93 --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 154 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h index 382c86e..2220e03 100644 --- a/include/osmocom/usb/libusb.h +++ b/include/osmocom/usb/libusb.h @@ -62,6 +62,14 @@ libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, const struct dev_id *dev_ids); +libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *path); + +libusb_device *osmo_libusb_find_matching_dev_serial(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *serial); + int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, struct usb_interface_match *out, unsigned int out_len); diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index b10f5be..9ad6240 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -220,6 +220,152 @@ return out; } +/*! Find a USB device of matching VendorID/ProductID at given path. + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples + * \param[in] path string representation of USB path + * \returns libusb_device if there was exactly one match; NULL otherwise */ +libusb_device *osmo_libusb_find_matching_dev_path(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *path) +{ + libusb_device **list; + libusb_device *match = NULL; + unsigned int i; + int rc; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) + return NULL; + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + char pathbuf[128]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "couldn't get device descriptor\n"); + continue; + } + + /* check if device doesn't match */ + if (!match_dev_ids(&dev_desc, dev_ids)) + continue; + + /* check if path doesn't match */ + if (path) { + osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), dev); + if (strcmp(pathbuf, path)) + continue; + } + + if (match) { + /* we already have a match, but now found a second -> FAIL */ + libusb_free_device_list(list, 1); + LOGP(DLUSB, LOGL_ERROR, "Found more than one matching USB device\n"); + return NULL; + } else + match = dev; + } + + if (!match) { + /* no match: free the list with automatic unref of all devices */ + libusb_free_device_list(list, 1); + return NULL; + } + + /* unref all devices *except* the match we found */ + for (i = 0; list[i] != NULL; i++) { + libusb_device *dev = list[i]; + if (dev != match) + libusb_unref_device(dev); + } + /* free the list *without* automatic unref of all devices */ + libusb_free_device_list(list, 0); + return match; +} + +/*! Find a USB device of matching VendorID/ProductID and given iSerial string. + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zer-oterminated array of VendorId/ProductId tuples + * \param[in] serial string representation of serial number + * \returns libusb_device if there was exactly one match; NULL otherwise */ +libusb_device *osmo_libusb_find_matching_dev_serial(struct libusb_context *luctx, + const struct dev_id *dev_ids, + const char *serial) +{ + libusb_device **list; + libusb_device *match = NULL; + unsigned int i; + int rc; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) + return NULL; + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "couldn't get device descriptor\n"); + continue; + } + + /* check if device doesn't match */ + if (!match_dev_ids(&dev_desc, dev_ids)) + continue; + + /* check if serial number string doesn't match */ + if (serial) { + char strbuf[256]; + libusb_device_handle *devh; + rc = libusb_open(dev, &devh); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "Cannot open USB Device: %s\n", + libusb_strerror(rc)); + /* there's no point in continuing here, as we don't know if there + * are multiple matches if we cannot read the iSerial string of all + * devices with matching vid/pid */ + libusb_free_device_list(list, 1); + return NULL; + } + rc = libusb_get_string_descriptor_ascii(devh, dev_desc.iSerialNumber, + (uint8_t *) strbuf, sizeof(strbuf)); + libusb_close(devh); + if (strcmp(strbuf, serial)) + continue; + } + + if (match) { + /* we already have a match, but now found a second -> FAIL */ + libusb_free_device_list(list, 1); + LOGP(DLUSB, LOGL_ERROR, "Found more than one matching USB device\n"); + return NULL; + } else + match = dev; + } + + if (!match) { + /* no match: free the list with automatic unref of all devices */ + libusb_free_device_list(list, 1); + return NULL; + } + + /* unref all devices *except* the match we found */ + for (i = 0; list[i] != NULL; i++) { + libusb_device *dev = list[i]; + if (dev != match) + libusb_unref_device(dev); + } + /* free the list *without* automatic unref of all devices */ + libusb_free_device_list(list, 0); + return match; +} + + /*! find a matching interface among all interfaces of the given USB device. * \param[in] dev USB device in which we shall search * \param[in] class USB Interface Class to look for -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8ff3fb3e1a77e10cb313473480ce5e7673749a93 Gerrit-Change-Number: 16830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:26:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:26:10 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jan 2020 15:26:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:27:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:27:08 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:27:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:27:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:27:48 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... Patch Set 2: it's a bit late now, but I just realized that the gerrit job names don't have the 'erlang' part in the name. This can lead to some confusion with other (C) Osmocom projects, but I guess it's mostly cosmetic. Luckily we don't have osmo_ss7 in C and in Erlang. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:27:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:27:50 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... gerrit-verifications: fix erlang/osmo_ss7 name Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2 ("jobs/gerrit-verifications.yml: add erlang repos") Related: OS#4345 Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 --- M jobs/gerrit-verifications.yml 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5703bf8..80a3b08 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -198,6 +198,11 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} /build/contrib/jenkins.sh + - osmo_ss7: + repos_url: '{gerrit_url}/erlang/{repos}' + gerrit_project: 'erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' + - osmo-sip-connector - osmo-trx: @@ -228,11 +233,6 @@ concurrent: false cmd: './contrib/jenkins.sh' - - ss7: - repos_url: '{gerrit_url}/erlang/{repos}' - gerrit_project: 'erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh' - - osmo-ttcn3-hacks: repos_url: 'https://gerrit.osmocom.org/{repos}' slave_axis: !!python/tuple [ttcn3] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:31:42 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 17 Jan 2020 15:31:42 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications: fix erlang/osmo_ss7 name In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16907 ) Change subject: gerrit-verifications: fix erlang/osmo_ss7 name ...................................................................... Patch Set 2: > Patch Set 2: > > it's a bit late now, but I just realized that the gerrit job names don't have the 'erlang' part in the name. This can lead to some confusion with other (C) Osmocom projects, but I guess it's mostly cosmetic. Luckily we don't have osmo_ss7 in C and in Erlang. I see. If it should become a problem in the future, it should not be much effort to create the jobs with proper names and delete the old ones. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id78f7e62e12c7595329ef8a265e522f27a087604 Gerrit-Change-Number: 16907 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 17 Jan 2020 15:31:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 15:34:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 15:34:08 +0000 Subject: Change in simtrace2[master]: increase ringbuffer size from 512 to 1024 bytes References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16919 ) Change subject: increase ringbuffer size from 512 to 1024 bytes ...................................................................... increase ringbuffer size from 512 to 1024 bytes As reported in https://osmocom.org/issues/4335, there appear to be some cards / use cases in which the 512 byte sized ringbuffer is insufficient. As we do have free RAM available, we can easily increase the buffer size, despite not entirely knowing yet why it needs to be *that* large. Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Closes: OS#4335 --- M firmware/libcommon/include/ringbuffer.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/16919/1 diff --git a/firmware/libcommon/include/ringbuffer.h b/firmware/libcommon/include/ringbuffer.h index a6eddc9..23aaa59 100644 --- a/firmware/libcommon/include/ringbuffer.h +++ b/firmware/libcommon/include/ringbuffer.h @@ -21,7 +21,7 @@ #include #include -#define RING_BUFLEN 512 +#define RING_BUFLEN 1024 typedef struct ringbuf { uint8_t buf[RING_BUFLEN]; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Gerrit-Change-Number: 16919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 16:29:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 16:29:26 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 16:34:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 16:34:16 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Patch Set 2: Code-Review-1 The mentioned warnings have already been fixed by I1b0eff1396776900c1286e41da3aee3ff78b326e, so there is nothing left to do. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 16:34:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 16:45:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 16:45:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Add SCCP_Tests_RAW for testing the actual SCCP implementation Using SCCP_Tests_RAW.ttcn we can trasnceive decoded MTP3 primitives containing decoded SCCP messages against a remote SCCP implementation. Related: OS#4343 Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc --- A sccp/SCCP_CodecPort.ttcn M sccp/SCCP_Tests.cfg A sccp/SCCP_Tests_RAW.ttcn 3 files changed, 248 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16814/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 16:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 16:45:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 ) Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode ...................................................................... sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode It's easier to handle several tests if they are the ones connecting to the program under tests. Forthcoming SCCP_Tests_RAW require use of this mode too. Take the chance to tweak other values which were wrong, in order to have CR answered correctly with a CC later on. Related: OS#4343 Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d --- M sccp/SCCP_Tests.cfg M sccp/SCCP_Tests.default M sccp/SCCP_Tests.ttcn 3 files changed, 12 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/16920/1 diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg index 4b7e742..ab69a2d 100644 --- a/sccp/SCCP_Tests.cfg +++ b/sccp/SCCP_Tests.cfg @@ -16,4 +16,3 @@ [EXECUTE] SCCP_Tests.control -#SCCP_Tests.TC_routing_global_title_crash diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index f837664..a051517 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -1,16 +1,10 @@ [LOGGING] FileMask := LOG_ALL | TTCN_MATCHING | DEBUG_ENCDEC; -BSSAP.FileMask := LOG_NOTHING; -"SCCP_Test_M3UA".FileMask := ERROR | WARNING; -"SCCP_Test_SCCP".FileMask := ERROR | WARNING; -"IPA-CTRL-IPA".FileMask := ERROR | WARNING; -mtc.FileMask := ERROR | WARNING; - [TESTPORT_PARAMETERS] *.SCCP_DEMO_USER_VTY.CTRL_MODE := "client" -*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.1" -*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325" +*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.2" +*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" *.SCCP_DEMO_USER_VTY.CTRL_LOGIN_SKIPPED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered" @@ -20,17 +14,17 @@ [MODULE_PARAMETERS] M3UA_Emulation.tsp_logVerbose := true; -M3UA_Emulation.tsp_SCTP_Server_Mode := true; -M3UA_Emulation.tsp_M3UA_Server_Mode := true; +M3UA_Emulation.tsp_SCTP_Server_Mode := false; +M3UA_Emulation.tsp_M3UA_Server_Mode := false; SCCP_Tests.sccp_cfg := { { sccp_service_type := "mtp3_itu", sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, - own_pc := 185, - own_ssn := 254, - peer_pc := 23, - peer_ssn := 254, - sio := '83'O, + own_pc := 23, + own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + peer_pc := 1, + peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + sio := '03'O, /* NI=Internal, SCCP */ rctx := 0 } }; diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn index e76e9ac..835c934 100644 --- a/sccp/SCCP_Tests.ttcn +++ b/sccp/SCCP_Tests.ttcn @@ -2,6 +2,9 @@ * Author: Stefan Sperling * All Rights Reserved * + * The idea is that these tests are executed against sccp_demo_user from + * libosmo-sccp.git in server mode. + * * Released under the terms of GNU General Public License, Version 2 or * (at your option) any later version. * -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 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: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d Gerrit-Change-Number: 16920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 16:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 16:45:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 ) Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg ...................................................................... sccp: Rename module param sccp_cfg to mp_sccp_cfg Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 --- M sccp/SCCP_Tests.default M sccp/SCCP_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/16921/1 diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index a051517..6dda647 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -16,7 +16,7 @@ M3UA_Emulation.tsp_logVerbose := true; M3UA_Emulation.tsp_SCTP_Server_Mode := false; M3UA_Emulation.tsp_M3UA_Server_Mode := false; -SCCP_Tests.sccp_cfg := { +SCCP_Tests.mp_sccp_cfg := { { sccp_service_type := "mtp3_itu", sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn index 835c934..62c62c6 100644 --- a/sccp/SCCP_Tests.ttcn +++ b/sccp/SCCP_Tests.ttcn @@ -55,7 +55,7 @@ type record of SCCP_Configuration SCCP_Configurations; modulepar { - SCCP_Configurations sccp_cfg; + SCCP_Configurations mp_sccp_cfg; } function f_init(SCCP_Configuration cfg) runs on MTC_CT { @@ -106,13 +106,13 @@ var octetstring vl_userdata :='12345678901234567890'O; var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind; - f_init(sccp_cfg[0]); + f_init(mp_sccp_cfg[0]); /* Called address with routing indicator set to Global Title Address. This used to trigger the crash. */ v_CalledAddress := valueof(ts_SccpAddr_GT('012345'H)); - v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); A_PORT.send(t_ASP_N_UNITDATA_req(v_CalledAddress, v_CallingAddress, '00000001'B /* sequence control */, '00000001'B /* return option */, vl_userdata, omit)); diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 78ce80f..0091cb4 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -156,11 +156,11 @@ /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ testcase TC_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; - called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc, sccp_cfg[0].peer_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); - calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); - f_init_raw(sccp_cfg[0]); + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); f_exp_sccp(tr_SCCP_CC('000001'O, ?)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 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: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 Gerrit-Change-Number: 16921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 17:01:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 17:01:23 +0000 Subject: Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 17:01:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 17:15:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jan 2020 17:15:21 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test ...................................................................... ttcn3-testsuites.yml: Add job for ttcn3-sccp-test Only for nightly, not latest, since example/sccp_demo_user is not installed by autotools and debian packages, so only in nightly where we build from source we are able to copy it to docker image manually. Related: OS#4343 Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/16922/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 7bd72db..89d50cf 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -43,6 +43,8 @@ timer: 00 09 * * * - ttcn3-stp-test: timer: 30 09 * * * + - ttcn3-sccp-test: + timer: 00 10 * * * # latest stable - nplab-m3ua-test-latest: @@ -77,6 +79,8 @@ blocking: "^ttcn3-remsim-test.*" - ttcn3-stp-test-latest: blocking: "^ttcn3-stp-test.*" + #- ttcn3-sccp-test-latest: + # blocking: "^ttcn3-sccp-test.*" - job-template: name: '{job-name}' project-type: freestyle -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:06:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:06:35 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Abandoned The mentioned warnings have already been fixed by I1b0eff1396776900c1286e41da3aee3ff78b326e -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:07:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:07:12 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test ...................................................................... Patch Set 1: Code-Review+1 might be worth adding the reason also as comment in the yml file? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:07:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:07:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:07:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 ) Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 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: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d Gerrit-Change-Number: 16920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:07:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 ) Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 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: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 Gerrit-Change-Number: 16921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:08:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 ) Change subject: sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode ...................................................................... sccp: Modify SCCP_tests to be run against sccp_demo_user in srv mode It's easier to handle several tests if they are the ones connecting to the program under tests. Forthcoming SCCP_Tests_RAW require use of this mode too. Take the chance to tweak other values which were wrong, in order to have CR answered correctly with a CC later on. Related: OS#4343 Change-Id: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d --- M sccp/SCCP_Tests.cfg M sccp/SCCP_Tests.default M sccp/SCCP_Tests.ttcn 3 files changed, 12 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg index 4b7e742..ab69a2d 100644 --- a/sccp/SCCP_Tests.cfg +++ b/sccp/SCCP_Tests.cfg @@ -16,4 +16,3 @@ [EXECUTE] SCCP_Tests.control -#SCCP_Tests.TC_routing_global_title_crash diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index f837664..a051517 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -1,16 +1,10 @@ [LOGGING] FileMask := LOG_ALL | TTCN_MATCHING | DEBUG_ENCDEC; -BSSAP.FileMask := LOG_NOTHING; -"SCCP_Test_M3UA".FileMask := ERROR | WARNING; -"SCCP_Test_SCCP".FileMask := ERROR | WARNING; -"IPA-CTRL-IPA".FileMask := ERROR | WARNING; -mtc.FileMask := ERROR | WARNING; - [TESTPORT_PARAMETERS] *.SCCP_DEMO_USER_VTY.CTRL_MODE := "client" -*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.1" -*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2325" +*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "127.0.0.2" +*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" *.SCCP_DEMO_USER_VTY.CTRL_LOGIN_SKIPPED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered" @@ -20,17 +14,17 @@ [MODULE_PARAMETERS] M3UA_Emulation.tsp_logVerbose := true; -M3UA_Emulation.tsp_SCTP_Server_Mode := true; -M3UA_Emulation.tsp_M3UA_Server_Mode := true; +M3UA_Emulation.tsp_SCTP_Server_Mode := false; +M3UA_Emulation.tsp_M3UA_Server_Mode := false; SCCP_Tests.sccp_cfg := { { sccp_service_type := "mtp3_itu", sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, - own_pc := 185, - own_ssn := 254, - peer_pc := 23, - peer_ssn := 254, - sio := '83'O, + own_pc := 23, + own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + peer_pc := 1, + peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + sio := '03'O, /* NI=Internal, SCCP */ rctx := 0 } }; diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn index e76e9ac..835c934 100644 --- a/sccp/SCCP_Tests.ttcn +++ b/sccp/SCCP_Tests.ttcn @@ -2,6 +2,9 @@ * Author: Stefan Sperling * All Rights Reserved * + * The idea is that these tests are executed against sccp_demo_user from + * libosmo-sccp.git in server mode. + * * Released under the terms of GNU General Public License, Version 2 or * (at your option) any later version. * -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16920 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: Ibf99b1546411b9a9b4375b82f1003d93d3c1645d Gerrit-Change-Number: 16920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Add SCCP_Tests_RAW for testing the actual SCCP implementation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 ) Change subject: Add SCCP_Tests_RAW for testing the actual SCCP implementation ...................................................................... Add SCCP_Tests_RAW for testing the actual SCCP implementation Using SCCP_Tests_RAW.ttcn we can trasnceive decoded MTP3 primitives containing decoded SCCP messages against a remote SCCP implementation. Related: OS#4343 Change-Id: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc --- A sccp/SCCP_CodecPort.ttcn M sccp/SCCP_Tests.cfg A sccp/SCCP_Tests_RAW.ttcn 3 files changed, 248 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_CodecPort.ttcn b/sccp/SCCP_CodecPort.ttcn new file mode 100644 index 0000000..838517a --- /dev/null +++ b/sccp/SCCP_CodecPort.ttcn @@ -0,0 +1,73 @@ +module SCCP_CodecPort { + +/* Simple SCCP Codec Port, translating between raw MTP3 primitives with + * octetstring payload towards the MTP3 provider, and MTP3-SCCP primitives + * which carry the decoded SCCP data types as payload. + * + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from General_Types all; +import from Osmocom_Types all; + +import from MTP3asp_Types all; +import from MTP3asp_PortType all; +import from SCCP_Types all; + +/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERind with PDU_SCCP instead of octetstring */ +type record SCCP_MTP3_TRANSFERind { + MTP3_Field_sio sio, + integer opc, + integer dpc, + integer sls, + PDU_SCCP data +}; + +/* MTP3asp_Types.Types.MessageTypes.ASP_MTP3_TRANSFERreq with PDU_SCCP instead of octetstring */ +type record SCCP_MTP3_TRANSFERreq { + MTP3_Field_sio sio, + integer opc, + integer dpc, + integer sls, + PDU_SCCP data +}; + +private function f_dec_TRANSFERind(in ASP_MTP3_TRANSFERind pin, out SCCP_MTP3_TRANSFERind pout) { + pout.sio := pin.sio; + pout.opc := pin.opc; + pout.dpc := pin.dpc; + pout.sls := pin.sls; + pout.data := dec_PDU_SCCP(pin.data); + //port.setstate(0); +} with {extension "prototype(fast)" } + + +private function f_enc_TRANSFERreq(in SCCP_MTP3_TRANSFERreq pin, out ASP_MTP3_TRANSFERreq pout) { + pout.sio := pin.sio; + pout.opc := pin.opc; + pout.dpc := pin.dpc; + pout.sls := pin.sls; + pout.data := enc_PDU_SCCP(pin.data); + //port.setstate(0); +} with {extension "prototype(fast)" } + +type port SCCP_CODEC_PT message { + out SCCP_MTP3_TRANSFERreq; + in SCCP_MTP3_TRANSFERind, + ASP_MTP3_PAUSE, + ASP_MTP3_RESUME, + ASP_MTP3_STATUS; +} with { extension "internal user MTP3asp_PT + out(SCCP_MTP3_TRANSFERreq -> ASP_MTP3_TRANSFERreq: function(f_enc_TRANSFERreq)) + in(ASP_MTP3_TRANSFERind -> SCCP_MTP3_TRANSFERind: function(f_dec_TRANSFERind); + ASP_MTP3_PAUSE -> ASP_MTP3_PAUSE: simple; + ASP_MTP3_RESUME -> ASP_MTP3_RESUME: simple; + ASP_MTP3_STATUS -> ASP_MTP3_STATUS: simple)" +} + + +} diff --git a/sccp/SCCP_Tests.cfg b/sccp/SCCP_Tests.cfg index ab69a2d..8e51327 100644 --- a/sccp/SCCP_Tests.cfg +++ b/sccp/SCCP_Tests.cfg @@ -16,3 +16,4 @@ [EXECUTE] SCCP_Tests.control +SCCP_Tests_RAW.control diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn new file mode 100644 index 0000000..78ce80f --- /dev/null +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -0,0 +1,174 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * The idea is that these tests are executed against sccp_demo_user from + * libosmo-sccp.git in server mode. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module SCCP_Tests_RAW { + +import from General_Types all; +import from Osmocom_Types all; + +import from M3UA_Emulation all; + +import from SCCP_Types all; +import from SCCPasp_Types all; +import from SCCP_Templates all; +import from SCCP_Emulation all; +import from SCCP_CodecPort all; + +import from TELNETasp_PortType all; +import from Osmocom_VTY_Functions all; + +import from SCCP_Tests all; + +type component SCCP_Test_RAW_CT { + /* VTY to sccp_demo_user (not used yet) */ + port TELNETasp_PT SCCP_DEMO_USER_VTY; + + /* SCCP raw port runs on top of M3UA Emulation. + * "System Under Test" is libosmo-sccp's sccp_demo_user example program. */ + var M3UA_CT vc_M3UA; + port SCCP_CODEC_PT MTP3; + + var MSC_SCCP_MTP3_parameters g_param; +} + +private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT { + g_param := { + sio := { + ni := substr(oct2bit(cfg.sio),0,2), + prio := substr(oct2bit(cfg.sio),2,2), + si := substr(oct2bit(cfg.sio),4,4) + }, + opc := cfg.own_pc, + dpc := cfg.peer_pc, + sls := 0, + sccp_serviceType := cfg.sccp_service_type, + ssn := cfg.own_ssn + }; + + map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); + f_vty_set_prompts(SCCP_DEMO_USER_VTY); + f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + + /* Create and connect test components */ + vc_M3UA := M3UA_CT.create; + connect(self:MTP3, vc_M3UA:MTP3_SP_PORT); + map(vc_M3UA:SCTP_PORT, system:sctp); + + vc_M3UA.start(f_M3UA_Emulation(cfg.sctp_addr)); +} + +private function f_cleanup() runs on SCCP_Test_RAW_CT { + all component.stop; + unmap(vc_M3UA:SCTP_PORT, system:sctp); + disconnect(vc_M3UA:MTP3_SP_PORT, self:MTP3); + self.stop +} + +/* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 + +function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) +return template (value) PDU_SCCP { + var SCCP_param_CPartyAddressEnc calling_enc := ConvertASPAddressToEncodedAddress_itu(calling); + + var template (value) PDU_SCCP ret := { + connrequest := { + messageType := cr, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := 2, + pointer2 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + optionalPart := { + credit := omit, + callingPAddress := { + paramName := con_SCCP_cgPA, + paramLength := calling_enc.paramLength, /* overwritten */ + addr := calling_enc.addr + }, + data := omit, + hopCounter := omit, + importance := omit + }, + eop := { paramName:= con_SCCP_eop } + } + } + return ret; +} + +template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 dest_lref, + template (present) OCT3 source_lref) := { + connconfirm := { + messageType := cc, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := ?, + optionalPart := *, + eop := * + } +} + +private function f_send_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { + var SCCP_MTP3_TRANSFERreq tx := { + sio := g_param.sio, + opc := g_param.opc, + dpc := g_param.dpc, + sls := g_param.sls, + data := valueof(sccp) + }; + MTP3.send(tx); +} + +private function f_exp_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { + var SCCP_MTP3_TRANSFERind rx; + var template SCCP_MTP3_TRANSFERind exp := { + sio := g_param.sio, + opc := g_param.dpc, + dpc := g_param.opc, + sls := g_param.sls, + data := sccp + }; + timer T := 10.0; + T.start; + alt { + [] MTP3.receive(exp) -> value rx { + setverdict(pass); + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", exp); + } + } +} + +/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ +testcase TC_cr_cc() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc, sccp_cfg[0].peer_ssn, + sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, + sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + f_init_raw(sccp_cfg[0]); + f_sleep(1.0); + f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); + f_exp_sccp(tr_SCCP_CC('000001'O, ?)); +} + +control { + execute( TC_cr_cc() ); +} + + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16814 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: I07c43cfac9cdbdeccf102cd08309ca9ec64968cc Gerrit-Change-Number: 16814 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:08:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:08:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Rename module param sccp_cfg to mp_sccp_cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 ) Change subject: sccp: Rename module param sccp_cfg to mp_sccp_cfg ...................................................................... sccp: Rename module param sccp_cfg to mp_sccp_cfg Change-Id: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 --- M sccp/SCCP_Tests.default M sccp/SCCP_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn 3 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index a051517..6dda647 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -16,7 +16,7 @@ M3UA_Emulation.tsp_logVerbose := true; M3UA_Emulation.tsp_SCTP_Server_Mode := false; M3UA_Emulation.tsp_M3UA_Server_Mode := false; -SCCP_Tests.sccp_cfg := { +SCCP_Tests.mp_sccp_cfg := { { sccp_service_type := "mtp3_itu", sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" }, diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn index 835c934..62c62c6 100644 --- a/sccp/SCCP_Tests.ttcn +++ b/sccp/SCCP_Tests.ttcn @@ -55,7 +55,7 @@ type record of SCCP_Configuration SCCP_Configurations; modulepar { - SCCP_Configurations sccp_cfg; + SCCP_Configurations mp_sccp_cfg; } function f_init(SCCP_Configuration cfg) runs on MTC_CT { @@ -106,13 +106,13 @@ var octetstring vl_userdata :='12345678901234567890'O; var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind; - f_init(sccp_cfg[0]); + f_init(mp_sccp_cfg[0]); /* Called address with routing indicator set to Global Title Address. This used to trigger the crash. */ v_CalledAddress := valueof(ts_SccpAddr_GT('012345'H)); - v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); + v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); A_PORT.send(t_ASP_N_UNITDATA_req(v_CalledAddress, v_CallingAddress, '00000001'B /* sequence control */, '00000001'B /* return option */, vl_userdata, omit)); diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 78ce80f..0091cb4 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -156,11 +156,11 @@ /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ testcase TC_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; - called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc, sccp_cfg[0].peer_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); - calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn, - sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type)); - f_init_raw(sccp_cfg[0]); + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); f_exp_sccp(tr_SCCP_CC('000001'O, ?)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16921 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: Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 Gerrit-Change-Number: 16921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:09:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:09:32 +0000 Subject: Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:09:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:09:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:09:52 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jan 2020 21:09:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:09:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:09:53 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16922 ) Change subject: ttcn3-testsuites.yml: Add job for ttcn3-sccp-test ...................................................................... ttcn3-testsuites.yml: Add job for ttcn3-sccp-test Only for nightly, not latest, since example/sccp_demo_user is not installed by autotools and debian packages, so only in nightly where we build from source we are able to copy it to docker image manually. Related: OS#4343 Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 7bd72db..89d50cf 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -43,6 +43,8 @@ timer: 00 09 * * * - ttcn3-stp-test: timer: 30 09 * * * + - ttcn3-sccp-test: + timer: 00 10 * * * # latest stable - nplab-m3ua-test-latest: @@ -77,6 +79,8 @@ blocking: "^ttcn3-remsim-test.*" - ttcn3-stp-test-latest: blocking: "^ttcn3-stp-test.*" + #- ttcn3-sccp-test-latest: + # blocking: "^ttcn3-sccp-test.*" - job-template: name: '{job-name}' project-type: freestyle -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia0a68d74215bdc1bc6319241d60f858312fa14e9 Gerrit-Change-Number: 16922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:10:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:10:06 +0000 Subject: Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:10:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:10:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:10:07 +0000 Subject: Change in docker-playground[master]: Introduce ttcn-sccp dockerized setup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16893 ) Change subject: Introduce ttcn-sccp dockerized setup ...................................................................... Introduce ttcn-sccp dockerized setup Since examples/sccp_demo_user (the binary used to test SCCP) is not installed by libosmo-sccp.git during make install, we need to install it manually after "make" step, and hence it's only available in osmo-stp-master, because in osmo-stp-latest we used packaged files. Related: OS#4343 Depends: osmo-ttcn3-hacks.git Ied9fbfb9bd35a99205ca13db033dd9ea03d51238 Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b --- M osmo-stp-master/Dockerfile A ttcn3-sccp-test/Dockerfile A ttcn3-sccp-test/Makefile A ttcn3-sccp-test/SCCP_Tests.cfg A ttcn3-sccp-test/jenkins.sh 5 files changed, 109 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 622d0b9..e76e5a9 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -32,6 +32,7 @@ autoreconf -fi && \ ./configure && \ make -j8 install && \ + install examples/sccp_demo_user /usr/local/bin/ && \ ldconfig VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile new file mode 100644 index 0000000..d9c3232 --- /dev/null +++ b/ttcn3-sccp-test/Dockerfile @@ -0,0 +1,35 @@ +ARG USER +FROM $USER/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make sccp + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg + +CMD cd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile new file mode 100644 index 0000000..cbcd544 --- /dev/null +++ b/ttcn3-sccp-test/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data + +include ../make/Makefile diff --git a/ttcn3-sccp-test/SCCP_Tests.cfg b/ttcn3-sccp-test/SCCP_Tests.cfg new file mode 100644 index 0000000..0d6a91b --- /dev/null +++ b/ttcn3-sccp-test/SCCP_Tests.cfg @@ -0,0 +1,30 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/sccp/SCCP_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "SCCP_Tests" + +[TESTPORT_PARAMETERS] +*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "172.18.22.200" +*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" + +[MODULE_PARAMETERS] +SCCP_Tests.mp_sccp_cfg := { + { + sccp_service_type := "mtp3_itu", + sctp_addr := { 2905, "172.18.22.203", 2905, "172.18.22.200" }, + own_pc := 23, + own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + peer_pc := 1, + peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ + sio := '03'O, /* NI=Internal, SCCP */ + rctx := 0 + } +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +SCCP_Tests.control +SCCP_Tests_RAW.control diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh new file mode 100755 index 0000000..550dc43 --- /dev/null +++ b/ttcn3-sccp-test/jenkins.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +# Always require osmo-stp-master since is the only with sccp_demo_user installed +docker_images_require \ + "debian-stretch-build" \ + "osmo-stp-master" \ + "debian-stretch-titan" \ + "ttcn3-sccp-test" + +mkdir $VOL_BASE_DIR/sccp-tester +cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ + +mkdir $VOL_BASE_DIR/sccp +#cp osmo-sccp.cfg $VOL_BASE_DIR/sccp/ + +network_create 172.18.22.0/24 + +echo Starting container with sccp_demo_user +docker run --rm \ + --network $NET_NAME --ip 172.18.22.200 \ + -v $VOL_BASE_DIR/sccp:/data \ + --name ${BUILD_TAG}-stp -d \ + $REPO_USER/osmo-stp-master \ + /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 >>/data/sccp_demo_user.log 2>&1" + + +echo Starting container with SCCP testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.22.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/sccp-tester:/data \ + --name ${BUILD_TAG}-ttcn3-sccp-test \ + $REPO_USER/ttcn3-sccp-test + +docker container kill ${BUILD_TAG}-stp + +network_remove +collect_logs -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5a7e6ff5f6e5f6e34d6a5ab29bd760a6f9d49c4b Gerrit-Change-Number: 16893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:10:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:10:36 +0000 Subject: Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jan 2020 21:10:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 21:10:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jan 2020 21:10:38 +0000 Subject: Change in osmo-bts[master]: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16800 ) Change subject: L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() ...................................................................... L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() Due to relatively small training sequence of Access Bursts, there can be frequent false-positives (basically noise). Fortunately, we can distinguish them from the real Access Bursts by checking the signal measurements attached to them (BER, ToA and C/I). Let's reduce verbosity of logging messages as they are mostly useful for debugging and may confuse the users / operators. Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 --- M src/common/l1sap.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b73de29..889f7f6 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1358,7 +1358,7 @@ /* Check for RACH exceeding BER threshold (ghost RACH) */ if (rach_ind->ber10k > bts->max_ber10k_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access Burst on %s: " "BER10k(%u) > BER10k_MAX(%u)\n", chan_name, rach_ind->ber10k, bts->max_ber10k_rach); return false; @@ -1370,7 +1370,7 @@ * according to maximal allowed Timing Advance value. */ if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access Burst on %s: " "ToA(%d) exceeds the allowed range (%d..%d)\n", chan_name, toa256, RACH_MIN_TOA256, bts->max_ta * 256); return false; @@ -1378,7 +1378,7 @@ /* Link quality defined by C/I (Carrier-to-Interference ratio) */ if (rach_ind->lqual_cb < bts->min_qual_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + LOGPFN(DL1C, LOGL_DEBUG, rach_ind->fn, "Ignoring an Access Burst on %s: " "link quality (%d) below the minimum (%d)\n", chan_name, rach_ind->lqual_cb, bts->min_qual_rach); return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ab6727ffff00140a7f9e762b299b711481393f1 Gerrit-Change-Number: 16800 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 17 23:00:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jan 2020 23:00:29 +0000 Subject: Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16923 ) Change subject: VTY: fix writing of custom timer values to a configuration file ...................................................................... VTY: fix writing of custom timer values to a configuration file Calling osmo_tdef_vty_write() twice: with and without the 'timer ' prefix definitely looks like a bug. After setting any timer to a custom (non-default) value, config_write_net() would generate an incorrect configuration file: $ osmo-bsc -c /tmp/osmo-bsc.cfg There is no such command. Error occurred during reading the below line: T10 10 Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/16923/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 1195d65..d1a268d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1062,8 +1062,6 @@ ho_vty_write_net(vty, gsmnet); - osmo_tdef_vty_write(vty, gsmnet->T_defs, " "); - if (!gsmnet->dyn_ts_allow_tch_f) vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE); if (gsmnet->tz.override != 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 Gerrit-Change-Number: 16923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 12:26:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 18 Jan 2020 12:26:54 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix wrong param type in osmo_sccp_pnc_name() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 ) Change subject: sccp: Fix wrong param type in osmo_sccp_pnc_name() ...................................................................... sccp: Fix wrong param type in osmo_sccp_pnc_name() Wrong type was used when the function was introduced a few commits ago. Fixes: 5a7eb34f735e0ae93a74da3bc8361454457e49cdi Closes: CID#207712 Change-Id: Ie9b89483158dd6b988e4c34b497bf3b231c15cd3 --- M include/osmocom/sccp/sccp_types.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/24/16924/1 diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index f43f822..09bf271 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -81,7 +81,7 @@ }; extern const struct value_string osmo_sccp_pnc_names[]; -static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val) +static inline const char *osmo_sccp_pnc_name(enum sccp_parameter_name_codes val) { return get_value_string(osmo_sccp_pnc_names, val); } /* Figure 3/Q.713 Called/calling party address */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9b89483158dd6b988e4c34b497bf3b231c15cd3 Gerrit-Change-Number: 16924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 19:09:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 19:09:57 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix wrong param type in osmo_sccp_pnc_name() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 ) Change subject: sccp: Fix wrong param type in osmo_sccp_pnc_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9b89483158dd6b988e4c34b497bf3b231c15cd3 Gerrit-Change-Number: 16924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 18 Jan 2020 19:09:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 19:19:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 19:19:22 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: make source / destination name IEs optional by def... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 ) Change subject: gsup_protocol.hrl: make source / destination name IEs optional by default ...................................................................... gsup_protocol.hrl: make source / destination name IEs optional by default Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 --- M include/gsup_protocol.hrl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/25/16925/1 diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index 3f04ece..e304654 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -167,7 +167,7 @@ -define(MANDATORY_DEFAULT, [imsi, message_type]). --define(OPTIONAL_DEFAULT, [message_class]). +-define(OPTIONAL_DEFAULT, [message_class, source_name, destination_name]). -define (GSUP_MESSAGES(), #{ 16#04 => #{message_type => location_upd_req, mandatory => [], optional => [cn_domain]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 Gerrit-Change-Number: 16925 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 19:19:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 19:19:23 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 --- M include/gsup_protocol.hrl 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/26/16926/1 diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index e304654..3c867d6 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -198,9 +198,9 @@ 16#28 => #{message_type => mt_forward_sm_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui], optional => [sm_rp_mms]}, 16#29 => #{message_type => mt_forward_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]}, 16#2a => #{message_type => mt_forward_sm_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]}, - 16#2c => #{message_type => ready_for_sm_req, mandatory => [sm_alert_reason]}, - 16#2d => #{message_type => ready_for_sm_err, mandatory => [sm_rp_cause], optional => [sm_rp_ui]}, - 16#2e => #{message_type => ready_for_sm_res, mandatory => []}, + 16#2c => #{message_type => ready_for_sm_req, mandatory => [sm_rp_mr, sm_alert_reason]}, + 16#2d => #{message_type => ready_for_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]}, + 16#2e => #{message_type => ready_for_sm_res, mandatory => [sm_rp_mr]}, 16#30 => #{message_type => check_imei_req, mandatory => [imei]}, 16#31 => #{message_type => check_imei_err, mandatory => [cause]}, 16#32 => #{message_type => check_imei_res, mandatory => [imei_check_result]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 19:22:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 19:22:40 +0000 Subject: Change in simtrace2[master]: increase ringbuffer size from 512 to 1024 bytes In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16919 ) Change subject: increase ringbuffer size from 512 to 1024 bytes ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/16919/1/firmware/libcommon/include/ringbuffer.h File firmware/libcommon/include/ringbuffer.h: https://gerrit.osmocom.org/c/simtrace2/+/16919/1/firmware/libcommon/include/ringbuffer.h at 24 PS1, Line 24: 1024 Makes sense to add a comment like "FIXME: not entirely sure why it needs to be *that* large". -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Gerrit-Change-Number: 16919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 18 Jan 2020 19:22:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 20:50:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jan 2020 20:50:54 +0000 Subject: Change in libosmocore[master]: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16927 ) Change subject: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() ...................................................................... osmo_libusb: Check return of libusb_get_string_descriptor_ascii() Change-Id: Ifc0133737627a8277635f8f3662b3f6e922be149 Closes: CID#207713 --- M src/usb/osmo_libusb.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/16927/1 diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 9ad6240..7a13a7e 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -334,6 +334,12 @@ } rc = libusb_get_string_descriptor_ascii(devh, dev_desc.iSerialNumber, (uint8_t *) strbuf, sizeof(strbuf)); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "Cannot read USB Descriptor: %s\n", + libusb_strerror(rc)); + libusb_close(devh); + continue; + } libusb_close(devh); if (strcmp(strbuf, serial)) continue; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc0133737627a8277635f8f3662b3f6e922be149 Gerrit-Change-Number: 16927 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 20:50:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jan 2020 20:50:55 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_open_claim() all-in-one API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16928 ) Change subject: usb: Add osmo_libusb_find_open_claim() all-in-one API ...................................................................... usb: Add osmo_libusb_find_open_claim() all-in-one API This function offers the highest level of API among all libosmousb helper functions. It is intended as a one-stop shop for everything related to grabbing an interface. Change-Id: I748ded6cc7b73a73625588bd7a34a017a905b6bf --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 126 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/16928/1 diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h index 2220e03..9ad3f71 100644 --- a/include/osmocom/usb/libusb.h +++ b/include/osmocom/usb/libusb.h @@ -55,6 +55,31 @@ uint8_t string_idx; }; +/*! Description of the USB device+interface we're looking for */ +struct osmo_usb_matchspec { + /*! specify the USB device */ + struct { + int vendor_id; /*!< typically -1 for compile time defaults */ + int product_id; /*!< typically -1 for compile time defaults */ + char *path; /*!< used for disambiguation when multiple matches; can be NULL */ + } dev; + + /*! specify the USB configuration */ + int config_id; /*!< typically -1 unless user selects specific configuration */ + + /*! specify the USB interface */ + struct { + /* typically those three are set to application defaults */ + int class; /*!< -1 or a user-specified class */ + int subclass; /*!< -1 or a user-specified subclass */ + int proto; /*!< -1 or a user-specified protocol */ + + /* typically those two are -1; but user can override them */ + int num; + int altsetting; + } intf; +}; + char *osmo_libusb_dev_get_path_buf(char *buf, size_t bufsize, libusb_device *dev); char *osmo_libusb_dev_get_path_c(void *ctx, libusb_device *dev); @@ -81,6 +106,11 @@ libusb_device_handle *osmo_libusb_open_claim_interface(void *ctx, libusb_context *luctx, const struct usb_interface_match *ifm); +void osmo_libusb_match_init(struct osmo_usb_matchspec *cfg, int if_class, int if_subclass, int if_proto); + +libusb_device_handle *osmo_libusb_find_open_claim(const struct osmo_usb_matchspec *cfg, + const struct dev_id *default_dev_ids); + int osmo_libusb_get_ep_addrs(libusb_device_handle *devh, unsigned int if_num, uint8_t *out, uint8_t *in, uint8_t *irq); diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 7a13a7e..bfc67e6 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -587,6 +587,102 @@ return usb_devh; } +void osmo_libusb_match_init(struct osmo_usb_matchspec *cfg, int if_class, int if_subclass, int if_proto) +{ + cfg->dev.vendor_id = -1; + cfg->dev.product_id = -1; + cfg->dev.path = NULL; + + cfg->config_id = -1; + + cfg->intf.class = if_class; + cfg->intf.subclass = if_subclass; + cfg->intf.proto = if_proto; + + cfg->intf.num = cfg->intf.altsetting = -1; +} + + +/*! high-level all-in-one function for USB device, config + interface matching + opening. + * This function offers the highest level of API among all libosmousb helper functions. It + * is intended as a one-stop shop for everything related to grabbing an interface. + * + * 1) looks for a device matching either the VID/PID from 'cfg' or 'default_dev_ids', + * if more than one is found, the user is expected to fill in cfg->dev.path to disambiguate. + * 2) find any interfaces on the device that match the specification in 'cfg'. The match + * could be done based on any of (class, subclass, proto, interface number). If there + * are multiple matches, the caller must disambiguate by specifying the interface number. + * 3) open the USB device; set the configuration (if needed); claim the interface and set + * the altsetting + * + * \param[in] cfg user-supplied match configuration (from command line or config file) + * \param[in] default_dev_ids Default list of supported VendorId/ProductIds + * \returns libusb_device_handle on success, NULL on error + */ +libusb_device_handle *osmo_libusb_find_open_claim(const struct osmo_usb_matchspec *cfg, + const struct dev_id *default_dev_ids) +{ + struct usb_interface_match if_matches[16]; + struct usb_interface_match *ifm = NULL; + libusb_device_handle *usb_devh = NULL; + struct dev_id user_dev_ids[2] = { + { cfg->dev.vendor_id, cfg->dev.product_id }, + { 0, 0 } + }; + const struct dev_id *dev_ids = default_dev_ids; + libusb_device *dev; + int rc, i; + + /* Stage 1: Find a device matching either the user-specified VID/PID or + * the list of IDs in default_dev_ids plus optionally the user-specified path */ + if (cfg->dev.vendor_id != -1 || cfg->dev.product_id != -1) + dev_ids = user_dev_ids; + dev = osmo_libusb_find_matching_dev_path(NULL, dev_ids, cfg->dev.path); + if (!dev) + goto close_exit; + + /* Stage 2: Find any interfaces matching the class/subclass/proto as specified */ + rc = osmo_libusb_dev_find_matching_interfaces(dev, cfg->intf.class, cfg->intf.subclass, + cfg->intf.proto, if_matches, sizeof(if_matches)); + if (rc < 1) { + LOGP(DLUSB, LOGL_NOTICE, "can't find matching USB interface at device\n"); + goto close_exit; + } else if (rc == 1) { + ifm = if_matches; + } else if (rc > 1) { + if (cfg->intf.num == -1) { + LOGP(DLUSB, LOGL_ERROR, "Found %d matching USB interfaces, you " + "have to specify the interface number\n", rc); + goto close_exit; + } + for (i = 0; i < rc; i++) { + if (if_matches[i].interface == cfg->intf.num) { + ifm = &if_matches[i]; + break; + } + /* FIXME: match altsetting */ + } + } + if (!ifm) { + LOGP(DLUSB, LOGL_NOTICE, "Couldn't find matching interface\n"); + goto close_exit; + } + + /* Stage 3: Open device; set config (if required); claim interface; set altsetting */ + usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); + if (!usb_devh) { + LOGP(DLUSB, LOGL_ERROR, "can't open USB device (permissions issue?)\n"); + goto close_exit; + } + return usb_devh; +close_exit: + /* release if_matches */ + if (usb_devh) + libusb_close(usb_devh); + + return NULL; +} + /*! obtain the endpoint addresses for a given USB interface. * \param[in] devh USB device handle on which to operate * \param[in] if_num USB Interface number on which to operate -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I748ded6cc7b73a73625588bd7a34a017a905b6bf Gerrit-Change-Number: 16928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:33 +0000 Subject: Change in osmo-msc[master]: manuals/vty: update the VTY reference to reflect recent changes References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16929 ) Change subject: manuals/vty: update the VTY reference to reflect recent changes ...................................................................... manuals/vty: update the VTY reference to reflect recent changes Change-Id: I14a5c9adff649406b4a079a75f86167ae6b95db4 --- M doc/manuals/vty/msc_vty_reference.xml 1 file changed, 439 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/16929/1 diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 0e5d04d..b98f76e 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -18,10 +18,11 @@ - + + @@ -279,7 +280,7 @@ - + @@ -301,6 +302,7 @@ + @@ -359,6 +361,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -438,6 +489,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -472,7 +610,7 @@ - + @@ -480,15 +618,21 @@ - + + + + - + + + + @@ -497,10 +641,11 @@ - + + @@ -538,7 +683,7 @@ - + @@ -546,7 +691,7 @@ - + @@ -559,7 +704,7 @@ - + @@ -567,7 +712,7 @@ - + @@ -580,7 +725,7 @@ - + @@ -605,7 +750,7 @@ - + @@ -618,7 +763,7 @@ - + @@ -634,7 +779,7 @@ - + @@ -654,7 +799,7 @@ - + @@ -667,7 +812,7 @@ - + @@ -959,7 +1104,7 @@ - + @@ -981,6 +1126,7 @@ + @@ -1039,6 +1185,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1118,6 +1313,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1152,7 +1434,7 @@ - + @@ -1160,15 +1442,21 @@ - + + + + - + + + + @@ -1177,10 +1465,11 @@ - + + @@ -1218,7 +1507,7 @@ - + @@ -1226,7 +1515,7 @@ - + @@ -1239,7 +1528,7 @@ - + @@ -1247,7 +1536,7 @@ - + @@ -1260,7 +1549,7 @@ - + @@ -1285,7 +1574,7 @@ - + @@ -1298,7 +1587,7 @@ - + @@ -1314,7 +1603,7 @@ - + @@ -1334,7 +1623,7 @@ - + @@ -1347,7 +1636,7 @@ - + @@ -1379,7 +1668,7 @@ - + @@ -1417,7 +1706,7 @@ - + @@ -1430,7 +1719,7 @@ - + @@ -1791,7 +2080,7 @@ - + @@ -1813,6 +2102,7 @@ + @@ -2198,6 +2488,15 @@ + + + + + + + + + config-cs7-asp @@ -2225,6 +2524,21 @@ + + + + + + + + + + + + + + + @@ -2350,13 +2664,22 @@ - + + + + + + + + + + @@ -2425,6 +2748,17 @@ + + + + + + + + + + + config-msc @@ -2479,11 +2813,12 @@ - + + @@ -2524,6 +2859,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I14a5c9adff649406b4a079a75f86167ae6b95db4 Gerrit-Change-Number: 16929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:34 +0000 Subject: Change in osmo-msc[master]: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16930 ) Change subject: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr ...................................................................... libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr It's never used anywhere in the code. Change-Id: I1b322b57fa0fd17ae2ebe1a2af2d8a93d81e14f0 --- M include/osmocom/msc/vlr.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/16930/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index ee5a234..d22e3ec 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -129,7 +129,6 @@ char msisdn[GSM23003_MSISDN_MAX_DIGITS+1]; /* 2.1.2 */ char name[VLR_NAME_LENGTH+1]; /* proprietary */ OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */ - uint32_t periodic_lu_timer; /* 2.4.24 */ uint32_t age_indicator; /* 2.17.1 */ /* Authentication Data */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b322b57fa0fd17ae2ebe1a2af2d8a93d81e14f0 Gerrit-Change-Number: 16930 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:35 +0000 Subject: Change in osmo-msc[master]: osmo-msc: fix: properly initialize default values for MGW timers References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16931 ) Change subject: osmo-msc: fix: properly initialize default values for MGW timers ...................................................................... osmo-msc: fix: properly initialize default values for MGW timers Otherwise they're all set to 0, if not configured in the VTY. Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/16931/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index cffdaef..dc6b684 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -220,9 +220,11 @@ net->gsup_server_port = MSC_HLR_REMOTE_PORT_DEFAULT; mgcp_client_conf_init(&net->mgw.conf); - net->mgw.tdefs = g_mgw_tdefs; net->call_waiting = true; + net->mgw.tdefs = g_mgw_tdefs; + osmo_tdefs_reset(net->mgw.tdefs); + return net; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 Gerrit-Change-Number: 16931 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:35 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... VTY: add osmo_tdef introspection and configuration commands This change introduces a group of new VTY commands letting the user a possibility to introspect and reconfigure some of the existing timers implemented using libosmocore's osmo_tdef API. At the moment this covers the following timers: - MGW specific timers: - X1 - MGCP response timeout, - X2 - RTP stream establishing timeout, - RAN specific timers (common for GERAN and UTRAN): - X1 - Authentication and Ciphering timeout, - X2 - RAN connection release sanity timeout, - X3 - Handover procedure timeout. The following commands are introduced: - 'enable' node: - show timer (mgw|mncc|sccp) [TNNNN] - show timer ran (geran|utran|sgs) [TNNNN] - show timer [all] - 'config-msc' node: - timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)] - timer ran (geran|utran|sgs) [TNNNN] [(<0-2147483647>|default)] Both MNCC and SCCP related timer definitions are empty at the moment. Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M src/libmsc/msc_vty.c M tests/test_nodes.vty 3 files changed, 230 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/16932/1 diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index b98f76e..e3294cf 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -610,6 +610,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1434,6 +1462,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2875,6 +2931,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cd82a07..b43e950 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -40,6 +40,7 @@ #include #include #include +#include #ifdef BUILD_IU #include @@ -654,6 +655,61 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_timer, cfg_msc_timer_cmd, + "timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "Configure or show timers\n" + "MGW specific timers\n" + "MNCC specific timers\n" + "SCCP specific timers\n" + OSMO_TDEF_VTY_DOC_SET) +{ + const char *T_arg = argc > 1 ? argv[1] : NULL; + struct osmo_tdef *tdefs = NULL; + + if (!strcmp(argv[0], "mgw")) + tdefs = gsmnet->mgw.tdefs; + else if (!strcmp(argv[0], "mncc")) + tdefs = gsmnet->mncc_tdefs; + else if (!strcmp(argv[0], "sccp")) + tdefs = g_sccp_tdefs; + + /* Configure or show? */ + if (argc < 3) + return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL); + return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); +} + +DEFUN(cfg_msc_timer_ran, cfg_msc_timer_ran_cmd, + "timer ran (geran|utran|sgs) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "Configure or show timers\n" + "Show timers for a given RAN type\n" + "GERAN specific timers\n" + "UTRAN specific timers\n" + "SGs specific timers\n" + OSMO_TDEF_VTY_DOC_SET) +{ + const char *T_arg = argc > 1 ? argv[1] : NULL; + struct osmo_tdef *tdefs = NULL; + + /* Match RAN type by the first character */ + switch (argv[0][0]) { + case 'g': + tdefs = msc_tdefs_geran; + break; + case 'u': + tdefs = msc_tdefs_utran; + break; + case 's': + tdefs = msc_tdefs_sgs; + break; + } + + /* Configure or show? */ + if (argc < 3) + return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL); + return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); +} + static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -716,6 +772,92 @@ neighbor_ident_vty_write(vty); + /* Timer management commands */ + osmo_tdef_vty_write(vty, gsmnet->mgw.tdefs, " timer mgw "); + osmo_tdef_vty_write(vty, gsmnet->mncc_tdefs, " timer mncc "); + osmo_tdef_vty_write(vty, g_sccp_tdefs, " timer sccp "); + + /* TODO: can we use osmo_tdef_group for that? */ + osmo_tdef_vty_write(vty, msc_tdefs_geran, " timer ran geran "); + osmo_tdef_vty_write(vty, msc_tdefs_utran, " timer ran utran "); + osmo_tdef_vty_write(vty, msc_tdefs_sgs, " timer ran sgs "); + + return CMD_SUCCESS; +} + +DEFUN(show_timer, show_timer_cmd, + "show timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL, + SHOW_STR "Show timers\n" + "MGW specific timers\n" + "MNCC specific timers\n" + "SCCP specific timers\n" + OSMO_TDEF_VTY_DOC_T) +{ + const char *T_arg = argc > 1 ? argv[1] : NULL; + struct osmo_tdef *tdefs = NULL; + + if (!strcmp(argv[0], "mgw")) + tdefs = gsmnet->mgw.tdefs; + else if (!strcmp(argv[0], "mncc")) + tdefs = gsmnet->mncc_tdefs; + else if (!strcmp(argv[0], "sccp")) + tdefs = g_sccp_tdefs; + + return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL); +} + +DEFUN(show_timer_ran, show_timer_ran_cmd, + "show timer ran (geran|utran|sgs) " OSMO_TDEF_VTY_ARG_T_OPTIONAL, + SHOW_STR "Show timers\n" + "Show timers for a given RAN type\n" + "GERAN specific timers\n" + "UTRAN specific timers\n" + "SGs specific timers\n" + OSMO_TDEF_VTY_DOC_T) +{ + const char *T_arg = argc > 1 ? argv[1] : NULL; + struct osmo_tdef *tdefs = NULL; + + /* Match RAN type by the first character */ + switch (argv[0][0]) { + case 'g': + tdefs = msc_tdefs_geran; + break; + case 'u': + tdefs = msc_tdefs_utran; + break; + case 's': + tdefs = msc_tdefs_sgs; + break; + } + + return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL); +} + +/* TODO: move to libosmocore? */ +#define TDEF_LIST_EMPTY(list) \ + !(list->T || list->default_val || list->desc) + +#define TDEF_LIST_PRINT(list, desc, offset) \ + if (!(TDEF_LIST_EMPTY(list))) { \ + vty_out(vty, "%s:%s", desc, VTY_NEWLINE); \ + osmo_tdef_vty_out_all(vty, list, "%*c", offset, ' '); \ + } + +DEFUN(show_timer_all, show_timer_all_cmd, + "show timer [all]", + SHOW_STR "Show timers\n" + "Show all existing timers\n") +{ + TDEF_LIST_PRINT(gsmnet->mgw.tdefs, "MGW specific timers", 2); + TDEF_LIST_PRINT(gsmnet->mncc_tdefs, "MNCC specific timers", 2); + TDEF_LIST_PRINT(g_sccp_tdefs, "SCCP specific timers", 2); + + vty_out(vty, "%sRAN specific timers:%s", VTY_NEWLINE, VTY_NEWLINE); + TDEF_LIST_PRINT(msc_tdefs_geran, " GERAN", 4); + TDEF_LIST_PRINT(msc_tdefs_utran, " UTRAN", 4); + TDEF_LIST_PRINT(msc_tdefs_sgs, " SGs", 4); + return CMD_SUCCESS; } @@ -2001,6 +2143,9 @@ install_element(MSC_NODE, &cfg_msc_osmux_cmd); install_element(MSC_NODE, &cfg_msc_handover_number_range_cmd); + install_element(MSC_NODE, &cfg_msc_timer_cmd); + install_element(MSC_NODE, &cfg_msc_timer_ran_cmd); + neighbor_ident_vty_init(msc_network); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); @@ -2013,6 +2158,10 @@ osmo_signal_register_handler(SS_SCALL, scall_cbfn, NULL); + install_element_ve(&show_timer_cmd); + install_element_ve(&show_timer_ran_cmd); + install_element_ve(&show_timer_all_cmd); + install_element_ve(&show_subscr_cmd); install_element_ve(&show_subscr_cache_cmd); install_element_ve(&show_bsc_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a4e0e15..da565f4 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -65,6 +65,8 @@ no sms-over-gsup osmux (on|off|only) handover-number range MSISDN_FIRST MSISDN_LAST + timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)] + timer ran (geran|utran|sgs) [TNNNN] [(<0-2147483647>|default)] neighbor (a|iu) lac <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:35 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 These timers so far were implemented as a list of unsigned integers, which has never been initialized to any reasonable defaults. Since they are used as state timeouts in several FSMs, we might end up staying in some state forever. Let's migrate to generic osmo_tdef API and use default values from table 11.2 of 3GPP TS 24.008. This way the user can introspect and change their values from the VTY / configuration file. Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/vlr.h M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/test_nodes.vty 5 files changed, 38 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/16933/1 diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index e3294cf..aed52ee 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -610,10 +610,11 @@ - + + @@ -1462,10 +1463,11 @@ - + + @@ -2931,9 +2933,10 @@ - + + diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index d22e3ec..1508598 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -252,13 +252,6 @@ int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); }; -enum vlr_timer { - VLR_T_3250, - VLR_T_3260, - VLR_T_3270, - _NUM_VLR_TIMERS -}; - /* An instance of the VLR codebase */ struct vlr_instance { struct llist_head subscribers; @@ -275,7 +268,8 @@ bool auth_reuse_old_sets_on_error; bool parq_retrieve_imsi; bool is_ps; - uint32_t timer[_NUM_VLR_TIMERS]; + /* see vlr_instance_tdefs */ + struct osmo_tdef *tdefs; } cfg; /* A free-form pointer for use by the caller */ void *user_ctx; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index b43e950..f6dfaaa 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -656,8 +656,9 @@ } DEFUN(cfg_msc_timer, cfg_msc_timer_cmd, - "timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, + "timer (vlr|mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL, "Configure or show timers\n" + "VLR specific timers\n" "MGW specific timers\n" "MNCC specific timers\n" "SCCP specific timers\n" @@ -666,7 +667,9 @@ const char *T_arg = argc > 1 ? argv[1] : NULL; struct osmo_tdef *tdefs = NULL; - if (!strcmp(argv[0], "mgw")) + if (!strcmp(argv[0], "vlr")) + tdefs = gsmnet->vlr->cfg.tdefs; + else if (!strcmp(argv[0], "mgw")) tdefs = gsmnet->mgw.tdefs; else if (!strcmp(argv[0], "mncc")) tdefs = gsmnet->mncc_tdefs; @@ -773,6 +776,7 @@ neighbor_ident_vty_write(vty); /* Timer management commands */ + osmo_tdef_vty_write(vty, gsmnet->vlr->cfg.tdefs, " timer vlr "); osmo_tdef_vty_write(vty, gsmnet->mgw.tdefs, " timer mgw "); osmo_tdef_vty_write(vty, gsmnet->mncc_tdefs, " timer mncc "); osmo_tdef_vty_write(vty, g_sccp_tdefs, " timer sccp "); @@ -786,8 +790,9 @@ } DEFUN(show_timer, show_timer_cmd, - "show timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL, + "show timer (vlr|mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL, SHOW_STR "Show timers\n" + "VLR specific timers\n" "MGW specific timers\n" "MNCC specific timers\n" "SCCP specific timers\n" @@ -796,7 +801,9 @@ const char *T_arg = argc > 1 ? argv[1] : NULL; struct osmo_tdef *tdefs = NULL; - if (!strcmp(argv[0], "mgw")) + if (!strcmp(argv[0], "vlr")) + tdefs = gsmnet->vlr->cfg.tdefs; + else if (!strcmp(argv[0], "mgw")) tdefs = gsmnet->mgw.tdefs; else if (!strcmp(argv[0], "mncc")) tdefs = gsmnet->mncc_tdefs; @@ -849,6 +856,7 @@ SHOW_STR "Show timers\n" "Show all existing timers\n") { + TDEF_LIST_PRINT(gsmnet->vlr->cfg.tdefs, "VLR specific timers", 2); TDEF_LIST_PRINT(gsmnet->mgw.tdefs, "MGW specific timers", 2); TDEF_LIST_PRINT(gsmnet->mncc_tdefs, "MNCC specific timers", 2); TDEF_LIST_PRINT(g_sccp_tdefs, "SCCP specific timers", 2); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index b164fd8..0e7cfe8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -61,24 +62,20 @@ { 0, NULL } }; +/* 3GPP TS 24.008, table 11.2 Mobility management timers (network-side) */ +static struct osmo_tdef vlr_instance_tdefs[] = { + /* TODO: also define T3212 here */ + { .T = 3250, .default_val = 12, .desc = "TMSI Reallocation procedure" }, + { .T = 3260, .default_val = 12, .desc = "Authentication procedure" }, + { .T = 3270, .default_val = 12, .desc = "Identification procedure" }, + { /* terminator */ } +}; + +/* This is just a wrapper around the osmo_tdef API. + * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) { - uint32_t tidx = 0xffffffff; - - switch (timer) { - case 3270: - tidx = VLR_T_3270; - break; - case 3260: - tidx = VLR_T_3260; - break; - case 3250: - tidx = VLR_T_3250; - break; - } - - OSMO_ASSERT(tidx < sizeof(vlr->cfg.timer)); - return vlr->cfg.timer[tidx]; + return osmo_tdef_get(vlr->cfg.tdefs, timer, OSMO_TDEF_S, 0); } /* return static buffer with printable name of VLR subscriber */ @@ -1266,6 +1263,10 @@ /* defaults */ vlr->cfg.assign_tmsi = true; + /* Timers configuration */ + vlr->cfg.tdefs = vlr_instance_tdefs; + osmo_tdefs_reset(vlr->cfg.tdefs); + /* osmo_auth_fsm.c */ OSMO_ASSERT(osmo_fsm_register(&vlr_auth_fsm) == 0); /* osmo_lu_fsm.c */ diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index da565f4..39755c3 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -65,7 +65,7 @@ no sms-over-gsup osmux (on|off|only) handover-number range MSISDN_FIRST MSISDN_LAST - timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)] + timer (vlr|mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)] timer ran (geran|utran|sgs) [TNNNN] [(<0-2147483647>|default)] neighbor (a|iu) lac <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:43:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:43:36 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 47 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/16934/1 diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index aed52ee..d5273d4 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -2790,22 +2790,6 @@ - - - - - - - - - - - - - - - - diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 3459d15..2122d4b 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -205,9 +205,6 @@ struct vlr_instance *vlr; - /* Periodic location update default value */ - uint8_t t3212; - /* Global MNCC guard timer value */ int mncc_guard_timeout; /* Global guard timer value for NCSS sessions */ diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 91b6165..6c44820 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -51,9 +51,6 @@ net->a5_encryption_mask = (1 << 3) | (1 << 1); net->uea_encryption = true; - /* Use 30 min periodic update interval as sane default */ - net->t3212 = 5; - net->mncc_guard_timeout = 180; net->ncss_guard_timeout = 30; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index f6dfaaa..e7bea92 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -303,30 +303,45 @@ return CMD_SUCCESS; } -DEFUN(cfg_net_per_loc_upd, cfg_net_per_loc_upd_cmd, - "periodic location update <6-1530>", - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval in Minutes\n") +/* NOTE: actually this is subscriber expiration timeout */ +#define PER_LOC_UPD_STR "Periodic Location Updating Interval\n" + +DEFUN_DEPRECATED(cfg_net_per_loc_upd, cfg_net_per_loc_upd_cmd, + "periodic location update <6-1530>", + PER_LOC_UPD_STR PER_LOC_UPD_STR PER_LOC_UPD_STR + "Periodic Location Updating Interval in Minutes\n") { struct gsm_network *net = vty->index; + struct vlr_instance *vlr = net->vlr; + int minutes = atoi(argv[0]); - net->t3212 = atoi(argv[0]) / 6; + vty_out(vty, "%% 'periodic location update' is now deprecated: " + "use 'timer T3212' to change subscriber expiration " + "timeout.%s", VTY_NEWLINE); + + /* We used to double this value and add a minute when scheduling the + * expiration timer. Let's emulate the old behaviour here. */ + minutes = minutes * 2 + 1; + vty_out(vty, "%% Setting T2312 to %d minutes " + "(emulating the old behaviour).%s", + minutes, VTY_NEWLINE); + osmo_tdef_set(vlr->cfg.tdefs, 3212, minutes, OSMO_TDEF_M); return CMD_SUCCESS; } -DEFUN(cfg_net_no_per_loc_upd, cfg_net_no_per_loc_upd_cmd, - "no periodic location update", - NO_STR - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n") +DEFUN_DEPRECATED(cfg_net_no_per_loc_upd, cfg_net_no_per_loc_upd_cmd, + "no periodic location update", + NO_STR PER_LOC_UPD_STR PER_LOC_UPD_STR PER_LOC_UPD_STR) { struct gsm_network *net = vty->index; + struct vlr_instance *vlr = net->vlr; - net->t3212 = 0; + vty_out(vty, "%% 'periodic location update' is now deprecated: " + "use 'timer T3212' to change subscriber expiration " + "timeout.%s", VTY_NEWLINE); + + osmo_tdef_set(vlr->cfg.tdefs, 3212, 0, OSMO_TDEF_M); return CMD_SUCCESS; } @@ -389,11 +404,6 @@ vty_out(vty, " timezone %d %d%s", gsmnet->tz.hr, gsmnet->tz.mn, VTY_NEWLINE); } - if (gsmnet->t3212 == 0) - vty_out(vty, " no periodic location update%s", VTY_NEWLINE); - else - vty_out(vty, " periodic location update %u%s", - gsmnet->t3212 * 6, VTY_NEWLINE); if (gsmnet->emergency.route_to_msisdn) { vty_out(vty, " emergency-call route-to-msisdn %s%s", @@ -1015,7 +1025,6 @@ static void vty_dump_one_subscr(struct vty *vty, struct vlr_subscr *vsub, int offset, uint8_t dump_flags) { - struct gsm_network *net; struct timespec now; char buf[128]; @@ -1089,9 +1098,7 @@ VTY_NEWLINE); } - /* XXX move t3212 into struct vlr_instance? */ - net = vsub->vlr->user_ctx; - if (!net->t3212) { + if (!vlr_timer(vsub->vlr, 3212)) { MSC_VTY_DUMP(vty, offset, "Expires: never (T3212 is disabled)%s", VTY_NEWLINE); } else if (vsub->expire_lu == VLR_SUBSCRIBER_NO_EXPIRATION) { diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 0e7cfe8..6ab059b 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -64,7 +64,7 @@ /* 3GPP TS 24.008, table 11.2 Mobility management timers (network-side) */ static struct osmo_tdef vlr_instance_tdefs[] = { - /* TODO: also define T3212 here */ + { .T = 3212, .default_val = 60, .unit = OSMO_TDEF_M, .desc = "Subscriber expiration timeout" }, { .T = 3250, .default_val = 12, .desc = "TMSI Reallocation procedure" }, { .T = 3260, .default_val = 12, .desc = "Authentication procedure" }, { .T = 3270, .default_val = 12, .desc = "Identification procedure" }, @@ -496,14 +496,11 @@ void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) { - struct gsm_network *net = vsub->vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ struct timespec now; - /* The T3212 timeout value field is coded as the binary representation of the timeout - * value for periodic updating in decihours. Mark the subscriber as inactive if it missed - * two consecutive location updates. Timeout is twice the t3212 value plus one minute. */ + /* Mark the subscriber as inactive if it stopped to do periodical location updates. */ if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) == 0) { - vsub->expire_lu = now.tv_sec + (net->t3212 * 60 * 6 * 2) + 60; + vsub->expire_lu = now.tv_sec + vlr_timer(vsub->vlr, 3212); } else { LOGP(DVLR, LOGL_ERROR, "%s: Could not enable Location Update expiry: unable to read current time\n", vlr_subscr_name(vsub)); @@ -516,13 +513,11 @@ { struct vlr_instance *vlr = data; struct vlr_subscr *vsub, *vsub_tmp; - struct gsm_network *net; struct timespec now; /* Periodic location update might be disabled from the VTY, * so we shall not expire subscribers until explicit IMSI Detach. */ - net = vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ - if (!net->t3212) + if (!vlr_timer(vlr, 3212)) goto done; if (llist_empty(&vlr->subscribers)) diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 7b684fe..5d3db69 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -941,7 +941,7 @@ vlr_subscr_put(vsub, __func__); /* Let T3212 (periodic Location update timer) expire */ - fake_time_passes((net->t3212 * 60 * 6 * 2) + 60*4, 0); + fake_time_passes(vlr_timer(net->vlr, 3212) + 60 * 4, 0); /* The subscriber should now be gone. */ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 39755c3..0edd350 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -24,8 +24,6 @@ timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone - periodic location update <6-1530> - no periodic location update call-waiting no call-waiting @@ -154,7 +152,6 @@ authentication optional rrlp mode none mm info 1 - periodic location update 30 msc mncc guard-timeout 180 ncss guard-timeout 30 diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index f954b5d..b2a2fb4 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -198,17 +198,22 @@ self.vty.verify("periodic location update 5", ['% Unknown command.']) self.vty.verify("periodic location update 1531", ['% Unknown command.']) - # Enable periodic lu.. - self.vty.verify("periodic location update 60", ['']) + depr_str = "% 'periodic location update' is now deprecated: " \ + "use 'timer T3212' to change subscriber expiration timeout." + set_str = "% Setting T2312 to 121 minutes (emulating the old behaviour)." + + # Enable periodic LU (deprecated command) + self.vty.verify("periodic location update 60", [depr_str, set_str]) res = self.vty.command("write terminal") - self.assertTrue(res.find('periodic location update 60') > 0) + self.assertTrue(res.find('timer vlr T3212 121') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) self.assertEqual(res.find('no periodic location update'), -1) - # Now disable it.. - self.vty.verify("no periodic location update", ['']) + # Now disable it (deprecated command) + self.vty.verify("no periodic location update", [depr_str]) res = self.vty.command("write terminal") - self.assertEqual(res.find('periodic location update 60'), -1) - self.assertTrue(res.find('no periodic location update') > 0) + self.assertEqual(res.find('no periodic location update'), -1) + self.assertEqual(res.find('timer vlr T3212 121'), -1) def testShowNetwork(self): res = self.vty.command("show network") -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 18 23:59:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jan 2020 23:59:12 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_open_claim() all-in-one API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16928 ) Change subject: usb: Add osmo_libusb_find_open_claim() all-in-one API ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16928/1/include/osmocom/usb/libusb.h File include/osmocom/usb/libusb.h: https://gerrit.osmocom.org/c/libosmocore/+/16928/1/include/osmocom/usb/libusb.h at 73 PS1, Line 73: class Wouldn't this cause compilation errors if the header is included by a C++ file? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I748ded6cc7b73a73625588bd7a34a017a905b6bf Gerrit-Change-Number: 16928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 18 Jan 2020 23:59:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 00:17:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 00:17:30 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 to look at the new patch set (#2). Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 50 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/16934/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 00:20:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 00:20:40 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c at a80 PS1, Line 80: sizeof(vlr->cfg.timer) LOL, there was a bug: sizeof(vlr->cfg.timer) is 12 != ARRAY_SIZE(vlr->cfg.timer), so a value in range 4..11 could lead to a buffer overrun ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 19 Jan 2020 00:20:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 03:08:43 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 19 Jan 2020 03:08:43 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 03:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 03:10:26 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 19 Jan 2020 03:10:26 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: > Patch Set 2: > > > Patch Set 2: > > > > I would prefer if this was some kind of textual (human readable) parameter in the VTY. GSM/UMTS are complex enough as-is, we don't need to make it more complicated for people to write or read a config file by forcing the mto look up tables in specifications to figure out a certain numeric value. That's what we have value_string for, IMHO > > agree @laforge which of the values do you prefer? For the causes we have gsm48_gmm_cause_names. Which entries have whitespaces in there. Do you want to see "GMM_CAUSE_NO_GPRS_PLMN" or "GPRS services not allowed in this PLMN" in the vty configuration? I would prefer "GMM_CAUSE_NO_GPRS_PLMN". -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 03:10:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 19 10:14:27 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jan 2020 10:14:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5e242c114f523_70c32b2803bf45f4709171@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 119s] Processing triggers for libc-bin (2.19-18) ... [ 119s] [184/201] installing base-files-8 [ 119s] Processing triggers for man-db (2.7.0.2-5) ... [ 119s] [185/201] installing libmount1-2.25.2-6 [ 119s] Processing triggers for libc-bin (2.19-18) ... [ 119s] [186/201] installing mount-2.25.2-6 [ 119s] Processing triggers for man-db (2.7.0.2-5) ... [ 120s] [187/201] installing bash-4.3-11+b1 [ 120s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 120s] Processing triggers for man-db (2.7.0.2-5) ... [ 120s] [188/201] installing dpkg-dev-1.17.25 [ 121s] Processing triggers for man-db (2.7.0.2-5) ... [ 122s] [189/201] installing build-essential-11.7 [ 122s] [190/201] installing initscripts-2.88dsf-59 [ 123s] ==> File on system created by you or by a script. [ 123s] ==> File also in package provided by package maintainer. [ 123s] What would you like to do about it ? Your options are: [ 123s] Y or I : install the package maintainer's version [ 123s] N or O : keep your currently-installed version [ 123s] D : show the differences between the versions [ 123s] Z : start a shell to examine the situation [ 123s] The default action is to keep your current version. [28931s] qemu-system-x86_64: terminating on signal 15 from pid 16957 (fuser) [28931s] ### VM INTERACTION END ### [28931s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28931s] or the build host has a kernel or hardware problem... Job seems to be stuck here, killed. (after 28800 seconds of inactivity) -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From laforge at gnumonks.org Sun Jan 19 10:29:51 2020 From: laforge at gnumonks.org (Harald Welte) Date: Sun, 19 Jan 2020 11:29:51 +0100 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: <20200119102951.GJ2168975@nataraja> On Sun, Jan 19, 2020 at 03:10:26AM +0000, lynxis lazus wrote: > @laforge which of the values do you prefer? For the causes we have gsm48_gmm_cause_names. Which entries have whitespaces in there. Do you want to see "GMM_CAUSE_NO_GPRS_PLMN" or "GPRS services not allowed in this PLMN" in the vty configuration? I would prefer "GMM_CAUSE_NO_GPRS_PLMN". I would prefer something like "no-gprs-plmn" or NO_GPRS_PLMN. The first would be the most natural from the vty perspective. -- - Harald Welte http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6) From gerrit-no-reply at lists.osmocom.org Sun Jan 19 12:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 12:27:36 +0000 Subject: Change in ...osmo_gsup[master]: Introduce basic contrib/jenkins.sh for Jenkins build verification References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 ) Change subject: Introduce basic contrib/jenkins.sh for Jenkins build verification ...................................................................... Introduce basic contrib/jenkins.sh for Jenkins build verification Change-Id: I7b78aba09b1d249da90ad7a2d4359d8d23219ee5 Related: OS#4345 --- A contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/35/16935/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..bc676c6 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I7b78aba09b1d249da90ad7a2d4359d8d23219ee5 Gerrit-Change-Number: 16935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 12:28:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 12:28:12 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 19 Jan 2020 12:28:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 12:33:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 12:33:04 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16808/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16808/2/src/hlr_vty.c at 345 PS2, Line 345: CAUSE How about: ... cause (imsi-unknown|roaming-not-allowed) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 12:33:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 13:03:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 13:03:37 +0000 Subject: Change in ...osmo_gsup[master]: Add optional NUM_VECTORS_REQ IE to send_auth_info_req References: Message-ID: Hello lynxis lazus, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 to review the following change. Change subject: Add optional NUM_VECTORS_REQ IE to send_auth_info_req ...................................................................... Add optional NUM_VECTORS_REQ IE to send_auth_info_req Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b --- M include/gsup_protocol.hrl M src/gsup_protocol.erl M test/gsup_encode_decode_test.erl 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/36/16936/1 diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index 3f04ece..a08b934 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -107,6 +107,7 @@ sm_alert_reason => integer(), imei => binary(), imei_check_result => integer(), + num_vectors_req => integer(), message_class => integer(), source_name => binary(), destination_name => binary(), @@ -158,6 +159,7 @@ -define(SM_ALERT_REASON, 16#46). -define(IMEI, 16#50). -define(IMEI_CHECK_RESULT, 16#51). +-define(NUM_VECTORS_REQ, 16#52). -define(SOURCE_NAME, 16#60). -define(DESTINATION_NAME, 16#61). -define(AN_APDU, 16#62). @@ -173,7 +175,7 @@ 16#04 => #{message_type => location_upd_req, mandatory => [], optional => [cn_domain]}, 16#05 => #{message_type => location_upd_err, mandatory => [cause]}, 16#06 => #{message_type => location_upd_res, mandatory => [], optional => [msisdn, hlr_number, pdp_info_complete, pdp_info_list, pdp_charging]}, - 16#08 => #{message_type => send_auth_info_req, mandatory => [], optional => [cn_domain, auts, rand, supported_rat_types, current_rat_type]}, + 16#08 => #{message_type => send_auth_info_req, mandatory => [], optional => [cn_domain, auts, rand, supported_rat_types, current_rat_type, num_vectors_req]}, 16#09 => #{message_type => send_auth_info_err, mandatory => [cause]}, 16#0a => #{message_type => send_auth_info_res, mandatory => [], optional => [auth_tuples, auts, rand]}, 16#0b => #{message_type => auth_failure_report, mandatory => [], optional => [cn_domain]}, diff --git a/src/gsup_protocol.erl b/src/gsup_protocol.erl index 30d5574..5dd4bda 100644 --- a/src/gsup_protocol.erl +++ b/src/gsup_protocol.erl @@ -159,6 +159,10 @@ ?CHECK_LEN(imei_check_result, Len, 1, 1), decode_ie(Tail, Map#{imei_check_result => IMEIResult}); +decode_ie(<>, Map) -> + ?CHECK_LEN(num_vectors_req, Len, 1, 1), + decode_ie(Tail, Map#{num_vectors_req => NumVectorsRequest}); + decode_ie(<>, Map) -> decode_ie(Tail, Map#{source_name => SourceName}); @@ -467,6 +471,11 @@ ?CHECK_SIZE(imei_check_result, Len, Value), encode_ie(maps:without([imei_check_result], GSUPMessage), <>); +encode_ie(#{num_vectors_req := Value} = GSUPMessage, Head) -> + Len = 1, + ?CHECK_SIZE(num_vectors_req, Len, Value), + encode_ie(maps:without([num_vectors_req], GSUPMessage), <>); + encode_ie(#{source_name := Value} = GSUPMessage, Head) -> Len = size(Value), encode_ie(maps:without([source_name], GSUPMessage), <>); diff --git a/test/gsup_encode_decode_test.erl b/test/gsup_encode_decode_test.erl index c0d3a21..2153707 100644 --- a/test/gsup_encode_decode_test.erl +++ b/test/gsup_encode_decode_test.erl @@ -44,6 +44,15 @@ ?assertEqual(Map, gsup_protocol:decode(Bin)), ?assertEqual(Bin, gsup_protocol:encode(Map)). +sai_req_num_test() -> + Bin = <<16#08, ?TEST_IMSI_IE, ?TEST_CLASS_SUBSCR_IE, 16#52, 16#01, 16#02>>, + Map = #{imsi => <<"123456789012345">>, + message_class => 1, + message_type => send_auth_info_req, + num_vectors_req => 2}, + ?assertEqual(Map, gsup_protocol:decode(Bin)), + ?assertEqual(Bin, gsup_protocol:encode(Map)). + sai_req_eps_test() -> Bin = <<16#08, ?TEST_IMSI_IE, ?TEST_CLASS_SUBSCR_IE, ?TEST_SUPP_RAT_TYPES_IE, ?TEST_CURR_RAT_TYPE_LTE_IE>>, Map = #{imsi => <<"123456789012345">>, message_class => 1, message_type => send_auth_info_req, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b Gerrit-Change-Number: 16936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 13:12:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 13:12:20 +0000 Subject: Change in ...osmo_gsup[master]: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req References: Message-ID: Hello lynxis lazus, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 to review the following change. Change subject: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req ...................................................................... PDP_INFO_COMPLETE IE is optional for insert_sub_data_req Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c --- M include/gsup_protocol.hrl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_gsup refs/changes/37/16937/1 diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index a08b934..569def7 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -182,7 +182,7 @@ 16#0c => #{message_type => purge_ms_req, mandatory => [], optional => [cn_domain, hlr_number]}, 16#0d => #{message_type => purge_ms_err, mandatory => [cause]}, 16#0e => #{message_type => purge_ms_res, mandatory => [freeze_p_tmsi]}, - 16#10 => #{message_type => insert_sub_data_req, mandatory => [pdp_info_complete], optional => [cn_domain, msisdn, hlr_number, pdp_info_list, pdp_charging]}, + 16#10 => #{message_type => insert_sub_data_req, mandatory => [], optional => [cn_domain, msisdn, hlr_number, pdp_info_complete, pdp_info_list, pdp_charging]}, 16#11 => #{message_type => insert_sub_data_err, mandatory => [cause]}, 16#12 => #{message_type => insert_sub_data_res, mandatory => []}, 16#14 => #{message_type => delete_sub_data_req, mandatory => [], optional => [cn_domain, pdp_context_id]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c Gerrit-Change-Number: 16937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:03:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:03:17 +0000 Subject: Change in ...osmo_gsup[master]: Introduce basic contrib/jenkins.sh for Jenkins build verification In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 ) Change subject: Introduce basic contrib/jenkins.sh for Jenkins build verification ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I7b78aba09b1d249da90ad7a2d4359d8d23219ee5 Gerrit-Change-Number: 16935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 19 Jan 2020 14:03:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:03:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:03:34 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: make source / destination name IEs optional by def... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 ) Change subject: gsup_protocol.hrl: make source / destination name IEs optional by default ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 Gerrit-Change-Number: 16925 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:03:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:03:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:03:48 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:03:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:03:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:03:51 +0000 Subject: Change in ...osmo_gsup[master]: Introduce basic contrib/jenkins.sh for Jenkins build verification In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 ) Change subject: Introduce basic contrib/jenkins.sh for Jenkins build verification ...................................................................... Introduce basic contrib/jenkins.sh for Jenkins build verification Change-Id: I7b78aba09b1d249da90ad7a2d4359d8d23219ee5 Related: OS#4345 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I7b78aba09b1d249da90ad7a2d4359d8d23219ee5 Gerrit-Change-Number: 16935 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:04:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:04:18 +0000 Subject: Change in ...osmo_gsup[master]: Add optional NUM_VECTORS_REQ IE to send_auth_info_req In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 ) Change subject: Add optional NUM_VECTORS_REQ IE to send_auth_info_req ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b Gerrit-Change-Number: 16936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 19 Jan 2020 14:04:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:05:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:05:44 +0000 Subject: Change in ...osmo_gsup[master]: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 ) Change subject: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c Gerrit-Change-Number: 16937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 19 Jan 2020 14:05:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:06:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:06:48 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 2: > (1 comment) yes, all-lowercase with '-' as separator is the most "VTY like" -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 14:06:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:07:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:07:09 +0000 Subject: Change in osmo-msc[master]: manuals/vty: update the VTY reference to reflect recent changes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16929 ) Change subject: manuals/vty: update the VTY reference to reflect recent changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I14a5c9adff649406b4a079a75f86167ae6b95db4 Gerrit-Change-Number: 16929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 14:07:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:07:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:07:10 +0000 Subject: Change in osmo-msc[master]: manuals/vty: update the VTY reference to reflect recent changes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16929 ) Change subject: manuals/vty: update the VTY reference to reflect recent changes ...................................................................... manuals/vty: update the VTY reference to reflect recent changes Change-Id: I14a5c9adff649406b4a079a75f86167ae6b95db4 --- M doc/manuals/vty/msc_vty_reference.xml 1 file changed, 439 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 0e5d04d..b98f76e 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -18,10 +18,11 @@ - + + @@ -279,7 +280,7 @@ - + @@ -301,6 +302,7 @@ + @@ -359,6 +361,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -438,6 +489,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -472,7 +610,7 @@ - + @@ -480,15 +618,21 @@ - + + + + - + + + + @@ -497,10 +641,11 @@ - + + @@ -538,7 +683,7 @@ - + @@ -546,7 +691,7 @@ - + @@ -559,7 +704,7 @@ - + @@ -567,7 +712,7 @@ - + @@ -580,7 +725,7 @@ - + @@ -605,7 +750,7 @@ - + @@ -618,7 +763,7 @@ - + @@ -634,7 +779,7 @@ - + @@ -654,7 +799,7 @@ - + @@ -667,7 +812,7 @@ - + @@ -959,7 +1104,7 @@ - + @@ -981,6 +1126,7 @@ + @@ -1039,6 +1185,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1118,6 +1313,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1152,7 +1434,7 @@ - + @@ -1160,15 +1442,21 @@ - + + + + - + + + + @@ -1177,10 +1465,11 @@ - + + @@ -1218,7 +1507,7 @@ - + @@ -1226,7 +1515,7 @@ - + @@ -1239,7 +1528,7 @@ - + @@ -1247,7 +1536,7 @@ - + @@ -1260,7 +1549,7 @@ - + @@ -1285,7 +1574,7 @@ - + @@ -1298,7 +1587,7 @@ - + @@ -1314,7 +1603,7 @@ - + @@ -1334,7 +1623,7 @@ - + @@ -1347,7 +1636,7 @@ - + @@ -1379,7 +1668,7 @@ - + @@ -1417,7 +1706,7 @@ - + @@ -1430,7 +1719,7 @@ - + @@ -1791,7 +2080,7 @@ - + @@ -1813,6 +2102,7 @@ + @@ -2198,6 +2488,15 @@ + + + + + + + + + config-cs7-asp @@ -2225,6 +2524,21 @@ + + + + + + + + + + + + + + + @@ -2350,13 +2664,22 @@ - + + + + + + + + + + @@ -2425,6 +2748,17 @@ + + + + + + + + + + + config-msc @@ -2479,11 +2813,12 @@ - + + @@ -2524,6 +2859,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I14a5c9adff649406b4a079a75f86167ae6b95db4 Gerrit-Change-Number: 16929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:07:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:07:22 +0000 Subject: Change in osmo-msc[master]: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16930 ) Change subject: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b322b57fa0fd17ae2ebe1a2af2d8a93d81e14f0 Gerrit-Change-Number: 16930 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:07:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:07:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:07:36 +0000 Subject: Change in osmo-msc[master]: osmo-msc: fix: properly initialize default values for MGW timers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16931 ) Change subject: osmo-msc: fix: properly initialize default values for MGW timers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 Gerrit-Change-Number: 16931 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:07:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:08:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:08:25 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 14:08:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:09:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:09:09 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:09:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 14:10:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jan 2020 14:10:10 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jan 2020 14:10:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 16:08:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 19 Jan 2020 16:08:17 +0000 Subject: Change in libosmo-sccp[master]: sccp: Fix wrong param type in osmo_sccp_pnc_name() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 ) Change subject: sccp: Fix wrong param type in osmo_sccp_pnc_name() ...................................................................... sccp: Fix wrong param type in osmo_sccp_pnc_name() Wrong type was used when the function was introduced a few commits ago. Fixes: 5a7eb34f735e0ae93a74da3bc8361454457e49cdi Closes: CID#207712 Change-Id: Ie9b89483158dd6b988e4c34b497bf3b231c15cd3 --- M include/osmocom/sccp/sccp_types.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index f43f822..09bf271 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -81,7 +81,7 @@ }; extern const struct value_string osmo_sccp_pnc_names[]; -static inline const char *osmo_sccp_pnc_name(enum sccp_message_types val) +static inline const char *osmo_sccp_pnc_name(enum sccp_parameter_name_codes val) { return get_value_string(osmo_sccp_pnc_names, val); } /* Figure 3/Q.713 Called/calling party address */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9b89483158dd6b988e4c34b497bf3b231c15cd3 Gerrit-Change-Number: 16924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 16:10:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 19 Jan 2020 16:10:07 +0000 Subject: Change in libosmocore[master]: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16927 ) Change subject: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc0133737627a8277635f8f3662b3f6e922be149 Gerrit-Change-Number: 16927 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 19 Jan 2020 16:10:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 19 23:13:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jan 2020 23:13:00 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: remove unused (since the NiTB split up) signals References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16938 ) Change subject: msc/signal.h: remove unused (since the NiTB split up) signals ...................................................................... msc/signal.h: remove unused (since the NiTB split up) signals Change-Id: I3848d0db3c62de7613f609ad632641eb54453817 --- M include/osmocom/msc/signal.h 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/16938/1 diff --git a/include/osmocom/msc/signal.h b/include/osmocom/msc/signal.h index c7f8991..9153131 100644 --- a/include/osmocom/msc/signal.h +++ b/include/osmocom/msc/signal.h @@ -70,15 +70,6 @@ S_SCALL_DETACHED, }; -/* SS_IPAC_NWL signals */ -enum signal_ipaccess { - S_IPAC_NWL_COMPLETE, -}; - -enum signal_global { - S_GLOBAL_BTS_CLOSE_OM, -}; - struct paging_signal_data { struct vlr_subscr *vsub; struct msc_a *msc_a; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3848d0db3c62de7613f609ad632641eb54453817 Gerrit-Change-Number: 16938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jan 20 02:34:10 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Jan 2020 02:34:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_10/armv7l In-Reply-To: References: Message-ID: <5e2511bb9a604_70c32b2803bf45f48624bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_10/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 337s] | configure:4747: /usr/bin/nm -B "conftest.o" [ 337s] | configure:4750: output [ 337s] | 00000000 B some_variable [ 337s] | configure:4751: result: BSD nm [ 337s] | configure:4754: checking whether ln -s works [ 337s] | configure:4758: result: yes [ 337s] | configure:4766: checking the maximum length of command line arguments [ 337s] | configure:4897: result: 1572864 [ 337s] | configure:4945: checking how to convert arm-unknown-linux-gnueabihf file names to arm-unknown-linux-gnueabihf format [ 337s] | configure:4985: result: func_convert_file_noop [ 337s] | configure:4992: checking how to convert arm-unknown-linux-gnueabihf file names to toolchain format [ 337s] | configure:5012: result: func_convert_file_noop [ 337s] | configure:5019: checking for /usr/bin/ld option to reload object files [ 337s] | configure:5026: result: -r [ 337s] | configure:5100: checking for objdump [ 337s] | configure:5116: found /usr/bin/objdump [ 337s] | configure:5127: result: objdump [ 337s] | configure:5159: checking how to recognize dependent libraries [ 337s] | configure:5359: result: pass_all [ 337s] | configure:5444: checking for dlltool [ 337s] | configure:5474: result: no [ 337s] | configure:5504: checking how to associate runtime and link libraries [ 337s] | configure:5531: result: printf %s\n [ 337s] | configure:5592: checking for ar [ 337s] | configure:5608: found /usr/bin/ar [ 337s] | configure:5619: result: ar [ 339s] | configure:[ 298.389292] sysrq: SysRq : Power Off [ 339s] [ 298.425516] reboot: Power down [ 339s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:31:37 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:31:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter ...................................................................... Patch Set 2: Code-Review+2 > Patch Set 2: Code-Review+1 > > (2 comments) > > Not a merge blocker, but might be a desirable feature. Then I'll leave it like it is for now. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 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: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 07:31:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:31:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:31:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: f_perform_UL: add CnDomain parameter In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 ) Change subject: hlr: f_perform_UL: add CnDomain parameter ...................................................................... hlr: f_perform_UL: add CnDomain parameter Make it possible to do CS location update, not only PS. This is needed for upcoming D-GSM related tests. Related: SYS#4618 Change-Id: Idd699f054c9242614b9bea066428293f8b2da9c2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 4caa88e..b59f86e 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -447,7 +447,8 @@ } function f_perform_UL(hexstring imsi, template hexstring msisdn, - template (omit) integer exp_err_cause := omit) + template (omit) integer exp_err_cause := omit, + GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS) runs on HLR_ConnHdlr return GSUP_PDU { var GSUP_PDU ret; timer T := 3.0; @@ -457,7 +458,7 @@ exp_fail := true; } - GSUP.send(valueof(ts_GSUP_UL_REQ(imsi))); + GSUP.send(valueof(ts_GSUP_UL_REQ(imsi, dom))); T.start; alt { [exp_fail] GSUP.receive(tr_GSUP_UL_ERR(imsi, exp_err_cause)) -> value ret { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 880a6ad..0f36d4d 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -495,9 +495,9 @@ tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, { tr_GSUP_IE_IMSI(imsi), *, tr_GSUP_IE(OSMO_GSUP_AUTH_TUPLE_IE), * }); -template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi) := +template (value) GSUP_PDU ts_GSUP_UL_REQ(hexstring imsi, GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS) := ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, { - valueof(ts_GSUP_IE_IMSI(imsi)) }); + valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_CnDomain(dom)) }); template GSUP_PDU tr_GSUP_UL_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, imsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16911 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: Idd699f054c9242614b9bea066428293f8b2da9c2 Gerrit-Change-Number: 16911 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:32:13 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:32:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... Patch Set 2: Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 07:32:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:32:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:32:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: add titan.ProtocolModules.DNS In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 ) Change subject: deps: add titan.ProtocolModules.DNS ...................................................................... deps: add titan.ProtocolModules.DNS To be used in mslookup mDNS tests. Related: SYS#4618 Change-Id: I89dd528b7934892c5a24209374e8218a95db6ab3 --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index 043aaa3..b816c8f 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -19,6 +19,7 @@ OSMOGIT:=git://git.osmocom.org ECLIPSEGIT_REPOS= titan.Libraries.TCCUsefulFunctions \ + titan.ProtocolModules.DNS \ titan.ProtocolModules.ICMP \ titan.ProtocolModules.ICMPv6 \ titan.ProtocolModules.IP \ @@ -81,6 +82,7 @@ titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 titan.ProtocolModules.BSSMAP_commit= master +titan.ProtocolModules.DNS_commit= R.7.B titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446 titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A-5-ge120ace titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A-5-g85cb124 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16912 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: I89dd528b7934892c5a24209374e8218a95db6ab3 Gerrit-Change-Number: 16912 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:32:37 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:32:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... Patch Set 3: Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 07:32:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:32:40 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:32:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: use UDPasp from osmocom github fork In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 ) Change subject: deps: use UDPasp from osmocom github fork ...................................................................... deps: use UDPasp from osmocom github fork Has additional SO_REUSEADDR patch, which is needed for D-GSM mslookup mDNS testing. Related: SYS#4618 Change-Id: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index b816c8f..b04db9d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -40,7 +40,6 @@ titan.TestPorts.SIPmsg \ titan.TestPorts.TCPasp \ titan.TestPorts.TELNETasp \ - titan.TestPorts.UDPasp \ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ @@ -64,6 +63,7 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ + titan.TestPorts.UDPasp \ titan.ProtocolEmulations.M3UA \ titan.ProtocolEmulations.SCCP -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16913 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: Ie7e1c3dbd67dba9079a5768e442faffc936fd7fa Gerrit-Change-Number: 16913 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 07:41:25 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 20 Jan 2020 07:41:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#8). Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... hlr: add TC_MSLookup_mDNS_server Send an mslookup mDNS request to OsmoHLR and verify the answer. Related: SYS#4618 Depends: osmo-hlr I2fe453553c90e6ee527ed13a13089900efd488aa Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 274 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 10:22:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 10:22:30 +0000 Subject: Change in osmo-msc[master]: osmo-msc: fix: properly initialize default values for MGW timers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16931 ) Change subject: osmo-msc: fix: properly initialize default values for MGW timers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 Gerrit-Change-Number: 16931 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 10:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 10:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 10:30:06 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 679 PS1, Line 679: return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); argv[1]? https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 710 PS1, Line 710: return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); argv[1] ? https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 844 PS1, Line 844: osmo_tdef_vty_out_all(vty, list, "%*c", offset, ' '); \ Ugh, what does "%*c" mean? https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 848 PS1, Line 848: "show timer [all]", AFAIu all here is not needed at all so it can be dropped? Or otherwise leave it as mandatory, but having it as optional is confusing, as the user thinks the behavior is different. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 10:30:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 10:31:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 10:31:11 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16932/1//COMMIT_MSG at 15 PS1, Line 15: - MGW specific timers: BTW, I don't like the idea of having for instance X1 in 2 different categories, I think we should avoid it as much as possible. For instance changing some category to start at X100. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 10:31:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 10:37:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 10:37:56 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c at 71 PS1, Line 71: { /* terminator */ } "I'll be back" https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c at 1268 PS1, Line 1268: osmo_tdefs_reset(vlr->cfg.tdefs); That means afaiu each time a vlc is allocated, your VTY-set values will be erased. If several vlr_instance are allocated during run of process, what you need to do is to allocate a copy of the struct. We do that in some other project already. This allows also handling per object-instance timer values. Up to you whether it's needed or makes sense here. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 10:37:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 10:45:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 10:45:24 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 10:45:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:04:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 11:04:12 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmo-msc/+/16932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/16932/1//COMMIT_MSG at 15 PS1, Line 15: - MGW specific timers: > BTW, I don't like the idea of having for instance X1 in 2 different categories, I think we should av [?] Well, yeah. I also don't like such overlapping, and I believe we should keep all timers in the same 'numbering space'. Can we change numbers of the existing timers? If yes, I am reserving X2.. for GERAN, X3.. for UTRAN, and X4.. for SGs ;) https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 679 PS1, Line 679: return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); > argv[1]? There is noting wrong with pointer arithmetic, it's just the matter of style. Similar to having char *argv or char argv[] in function's arguments. I know you don't like this, but this is not prohibited by our coding standards [1]. Let's save our time for more important things, thank you! [1] https://www.osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 844 PS1, Line 844: osmo_tdef_vty_out_all(vty, list, "%*c", offset, ' '); \ > Ugh, what does "%*c" mean? Just like %c but with variable width. This nice feature is often used for alignment. https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 848 PS1, Line 848: "show timer [all]", > AFAIu all here is not needed at all so it can be dropped? Or otherwise leave it as mandatory, but ha [?] It's here just for convenience, because help message of 'timer' does not say that it can show all timers. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:04:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:12:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 11:12:17 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c at 71 PS1, Line 71: { /* terminator */ } > "I'll be back" Absolutely! https://gerrit.osmocom.org/c/osmo-msc/+/16933/1/src/libvlr/vlr.c at 1268 PS1, Line 1268: osmo_tdefs_reset(vlr->cfg.tdefs); > That means afaiu each time a vlc is allocated, your VTY-set values will be erased. [?] That's how it's done in the other places of code. We never allocate more than one VLR anyway, so we can keep it as is for now. If somebody needs (for any not-obvious reason) more than one VLR, it can be changed to: vlr->cfg.tdefs = *vlr_instance_tdefs; osmo_tdefs_reset(&vlr->cfg.tdefs); This is kind of a problem of the current osmo_tdef API - it mixes timer definition and current value in the same structure. I like the approach of osmo_fsm and osmo_fsm_inst. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:12:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:14:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 11:14:16 +0000 Subject: Change in osmo-msc[master]: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16930 ) Change subject: libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr ...................................................................... libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr It's never used anywhere in the code. Change-Id: I1b322b57fa0fd17ae2ebe1a2af2d8a93d81e14f0 --- M include/osmocom/msc/vlr.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index ee5a234..d22e3ec 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -129,7 +129,6 @@ char msisdn[GSM23003_MSISDN_MAX_DIGITS+1]; /* 2.1.2 */ char name[VLR_NAME_LENGTH+1]; /* proprietary */ OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */ - uint32_t periodic_lu_timer; /* 2.4.24 */ uint32_t age_indicator; /* 2.17.1 */ /* Authentication Data */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b322b57fa0fd17ae2ebe1a2af2d8a93d81e14f0 Gerrit-Change-Number: 16930 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:14:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 11:14:17 +0000 Subject: Change in osmo-msc[master]: osmo-msc: fix: properly initialize default values for MGW timers In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16931 ) Change subject: osmo-msc: fix: properly initialize default values for MGW timers ...................................................................... osmo-msc: fix: properly initialize default values for MGW timers Otherwise they're all set to 0, if not configured in the VTY. Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index cffdaef..dc6b684 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -220,9 +220,11 @@ net->gsup_server_port = MSC_HLR_REMOTE_PORT_DEFAULT; mgcp_client_conf_init(&net->mgw.conf); - net->mgw.tdefs = g_mgw_tdefs; net->call_waiting = true; + net->mgw.tdefs = g_mgw_tdefs; + osmo_tdefs_reset(net->mgw.tdefs); + return net; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a0823c2f0ca50ed7407fb0457c54a485799c585 Gerrit-Change-Number: 16931 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:40:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 11:40:16 +0000 Subject: Change in libosmocore[master]: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16927 ) Change subject: osmo_libusb: Check return of libusb_get_string_descriptor_ascii() ...................................................................... osmo_libusb: Check return of libusb_get_string_descriptor_ascii() Change-Id: Ifc0133737627a8277635f8f3662b3f6e922be149 Closes: CID#207713 --- M src/usb/osmo_libusb.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 9ad6240..7a13a7e 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -334,6 +334,12 @@ } rc = libusb_get_string_descriptor_ascii(devh, dev_desc.iSerialNumber, (uint8_t *) strbuf, sizeof(strbuf)); + if (rc < 0) { + LOGP(DLUSB, LOGL_ERROR, "Cannot read USB Descriptor: %s\n", + libusb_strerror(rc)); + libusb_close(devh); + continue; + } libusb_close(devh); if (strcmp(strbuf, serial)) continue; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc0133737627a8277635f8f3662b3f6e922be149 Gerrit-Change-Number: 16927 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:40:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 11:40:44 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: remove unused (since the NiTB split up) signals In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16938 ) Change subject: msc/signal.h: remove unused (since the NiTB split up) signals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3848d0db3c62de7613f609ad632641eb54453817 Gerrit-Change-Number: 16938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 11:40:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:40:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 11:40:45 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: remove unused (since the NiTB split up) signals In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16938 ) Change subject: msc/signal.h: remove unused (since the NiTB split up) signals ...................................................................... msc/signal.h: remove unused (since the NiTB split up) signals Change-Id: I3848d0db3c62de7613f609ad632641eb54453817 --- M include/osmocom/msc/signal.h 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/signal.h b/include/osmocom/msc/signal.h index c7f8991..9153131 100644 --- a/include/osmocom/msc/signal.h +++ b/include/osmocom/msc/signal.h @@ -70,15 +70,6 @@ S_SCALL_DETACHED, }; -/* SS_IPAC_NWL signals */ -enum signal_ipaccess { - S_IPAC_NWL_COMPLETE, -}; - -enum signal_global { - S_GLOBAL_BTS_CLOSE_OM, -}; - struct paging_signal_data { struct vlr_subscr *vsub; struct msc_a *msc_a; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3848d0db3c62de7613f609ad632641eb54453817 Gerrit-Change-Number: 16938 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:42:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:42:21 +0000 Subject: Change in libosmocore[master]: usb: Add osmo_libusb_find_open_claim() all-in-one API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16928 ) Change subject: usb: Add osmo_libusb_find_open_claim() all-in-one API ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16928/1/include/osmocom/usb/libusb.h File include/osmocom/usb/libusb.h: https://gerrit.osmocom.org/c/libosmocore/+/16928/1/include/osmocom/usb/libusb.h at 73 PS1, Line 73: class > Wouldn't this cause compilation errors if the header is included by a C++ file? Shouldn't it be fine if included as C? That's indeed a good question. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I748ded6cc7b73a73625588bd7a34a017a905b6bf Gerrit-Change-Number: 16928 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 11:42:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:43:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:43:14 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: make source / destination name IEs optional by def... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 ) Change subject: gsup_protocol.hrl: make source / destination name IEs optional by default ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 Gerrit-Change-Number: 16925 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:44:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:44:15 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:44:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:44:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:44:58 +0000 Subject: Change in ...osmo_gsup[master]: Add optional NUM_VECTORS_REQ IE to send_auth_info_req In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 ) Change subject: Add optional NUM_VECTORS_REQ IE to send_auth_info_req ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b Gerrit-Change-Number: 16936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:44:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:45:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:45:54 +0000 Subject: Change in ...osmo_gsup[master]: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 ) Change subject: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c Gerrit-Change-Number: 16937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 11:45:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:47:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 11:47:45 +0000 Subject: Change in osmo-bts[master]: measurment: write irssi_full_sum variable correctly References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16939 ) Change subject: measurment: write irssi_full_sum variable correctly ...................................................................... measurment: write irssi_full_sum variable correctly The variable irssi_full_sum is not populated with a dummy value when we are not able to compute irssi_full_sum. Instead we mistakenly write MEASUREMENT_DUMMY_IRSSI to ber_full_sum, which is wrong Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Related: OS#2987 --- M src/common/measurement.c M tests/meas/meas_test.ok M tests/meas/meas_testcases.h 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/16939/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 3e0daf1..2fdd524 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -655,7 +655,7 @@ ber_full_sum = ber_full_sum / num_ul_meas; if (!irssi_full_sum) - ber_full_sum = MEASUREMENT_DUMMY_IRSSI; + irssi_full_sum = MEASUREMENT_DUMMY_IRSSI; else irssi_full_sum = irssi_full_sum / num_ul_meas_actual; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index e62bb42..559a8e6 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -585,8 +585,8 @@ meas.ext.toa256_max | 0 | 0 meas.ms_toa256 | 0 | 0 meas.ext.toa256_std_dev | 0 | 0 -meas.ul_res.full.rx_lev | 63 | 63 -meas.ul_res.full.rx_qual | 3 | 3 +meas.ul_res.full.rx_lev | 1 | 1 +meas.ul_res.full.rx_qual | 7 | 7 =========================================================== diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h index fefa34f..d7eee5c 100644 --- a/tests/meas/meas_testcases.h +++ b/tests/meas/meas_testcases.h @@ -131,8 +131,8 @@ .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, - .rx_lev_full = 63, - .rx_qual_full = 3, + .rx_lev_full = 1, + .rx_qual_full = 7, .toa256_mean = 0, .toa256_max = 0, .toa256_min = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Gerrit-Change-Number: 16939 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 11:49:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 11:49:59 +0000 Subject: Change in osmo-bts[master]: measurment: write irssi_full_sum variable correctly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16939 ) Change subject: measurment: write irssi_full_sum variable correctly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Gerrit-Change-Number: 16939 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 20 Jan 2020 11:49:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:02:19 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 12:02:19 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 to look at the new patch set (#5). Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M .gitignore M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 773 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/16885/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:03:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 12:03:45 +0000 Subject: Change in osmo-bsc[master]: bsc_main: use higher default loglevels. In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16886 ) Change subject: bsc_main: use higher default loglevels. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16886/1/src/osmo-bsc/osmo_bsc_main.c at a716 PS1, Line 716: LOGL_INFO > What's wrong with having INFO by default? [?] I think its interesting for unit-tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03a5426b341e9908ffc89240f97d6d3ea791b4a8 Gerrit-Change-Number: 16886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 12:03:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:14:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 12:14:08 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 12:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:14 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 12:17:14 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#13). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 128 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/13 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:58 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:17:58 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py 1 file changed, 34 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/1 diff --git a/pySim-read.py b/pySim-read.py old mode 100755 new mode 100644 index 17fce61..2838973 --- a/pySim-read.py +++ b/pySim-read.py @@ -37,7 +37,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn def parse_options(): @@ -121,43 +121,53 @@ else: print("SMSP: Can't read, response code = %s" % (sw,)) + # EF.SPN + try: + (res, sw) = scc.read_binary(EF['SPN']) + if sw == '9000': + print("SPN, hplmn_disp, oplmn_disp: %s" % (dec_spn(res),)) + else: + print("SPN: Can't read, response code = %s" % (sw,)) + except Exception as e: + print "SPN: Can't read file -- " + str(e) + # EF.PLMNsel try: - (res, sw) = scc.read_binary(EF['PLMNsel']) - if sw == '9000': - print("PLMNsel: %s" % (res)) - else: - print("PLMNsel: Can't read, response code = %s" % (sw,)) + (res, sw) = scc.read_binary(EF['PLMNsel']) + if sw == '9000': + print("PLMNsel: %s" % (res)) + else: + print("PLMNsel: Can't read, response code = %s" % (sw,)) except Exception as e: print "HPLMNAcT: Can't read file -- " + str(e) # EF.PLMNwAcT - try: - (res, sw) = scc.read_binary(EF['PLMNwAcT']) - if sw == '9000': - print("PLMNwAcT:\n%s" % (format_xplmn_w_act(res))) - else: - print("PLMNwAcT: Can't read, response code = %s" % (sw,)) + try: + (res, sw) = scc.read_binary(EF['PLMNwAcT']) + if sw == '9000': + print("PLMNwAcT:\n%s" % (format_xplmn_w_act(res))) + else: + print("PLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: print "PLMNwAcT: Can't read file -- " + str(e) # EF.OPLMNwAcT - try: - (res, sw) = scc.read_binary(EF['OPLMNwAcT']) - if sw == '9000': - print("OPLMNwAcT:\n%s" % (format_xplmn_w_act(res))) - else: - print("OPLMNwAcT: Can't read, response code = %s" % (sw,)) + try: + (res, sw) = scc.read_binary(EF['OPLMNwAcT']) + if sw == '9000': + print("OPLMNwAcT:\n%s" % (format_xplmn_w_act(res))) + else: + print("OPLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: print "OPLMNwAcT: Can't read file -- " + str(e) # EF.HPLMNAcT - try: - (res, sw) = scc.read_binary(EF['HPLMNAcT']) - if sw == '9000': - print("HPLMNAcT:\n%s" % (format_xplmn_w_act(res))) - else: - print("HPLMNAcT: Can't read, response code = %s" % (sw,)) + try: + (res, sw) = scc.read_binary(EF['HPLMNAcT']) + if sw == '9000': + print("HPLMNAcT:\n%s" % (format_xplmn_w_act(res))) + else: + print("HPLMNAcT: Can't read, response code = %s" % (sw,)) except Exception as e: print "HPLMNAcT: Can't read file -- " + str(e) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:58 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:17:58 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Added feature to program SPN into sysmoUSIM-SJS1 SIM cards Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce --- M pySim/cards.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/16941/1 diff --git a/pySim/cards.py b/pySim/cards.py index a341b71..5d4d4f3 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -585,6 +585,9 @@ content = "01" + p['opc'] data, sw = self._scc.update_binary('00F7', content) + # set Service Provider Name + content = enc_spn(p['name'], True, True) + data, sw = self._scc.update_binary('6F46', rpad(content, 32)) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:59 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:17:59 +0000 Subject: Change in pysim[master]: Fix file permission References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Fix file permission Change-Id: I893869329e9547e06386baf4d16a18e545042d62 --- M pySim-read.py 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/16942/1 diff --git a/pySim-read.py b/pySim-read.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:59 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:17:59 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pySim/ts_51_011.py 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/1 diff --git a/pySim-read.py b/pySim-read.py index 2838973..fa6ccd6 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -114,6 +114,18 @@ else: print("IMSI: Can't read, response code = %s" % (sw,)) + # EF.SST + (res, sw) = scc.read_binary(EF['SST']) + if sw == '9000': + # print("USIM Service Table: %s" % res) + if len(res) >= 23: + swapped = swap_nibbles(res) + byte12 = int(swapped[22:24], 16) + service95_support = (byte12&0x40 == 0x40) + print("Service n95 - Support of UICC access to IMS: %s" % service95_support) + else: + print("USIM Service Table: Can't read, response code = %s" % (sw,)) + # EF.SMSP (res, sw) = scc.read_record(['3f00', '7f10', '6f42'], 1) if sw == '9000': diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 754d57f..4e61dca 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -67,6 +67,8 @@ 'EXT4': '6F4E', 'CMI': '6F58', 'ECCP': '6F4F', +# IMS related parameters +'EFUICCIARI': '6FE7', # DF_GRAPHICS 'IMG': '4F20', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:17:59 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:17:59 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Fixed MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/1 diff --git a/pySim/utils.py b/pySim/utils.py index 65f10c5..3b6c0bc 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -124,9 +124,13 @@ digit3 = ia[1] & 0x0F # 2nd byte, LSB if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF: return 0xFFF # 4095 - mcc = digit1 * 100 - mcc += digit2 * 10 - mcc += digit3 + mcc = 0 + if digit1 != 0XF: + mcc += digit1 * 100 + if digit2 != 0XF: + mcc += digit2 * 10 + if digit3 != 0XF: + mcc += digit3 return mcc def dec_mnc_from_plmn(plmn): @@ -139,12 +143,17 @@ mnc = 0 # signifies two digit MNC if digit3 == 0xF: - mnc += digit1 * 10 - mnc += digit2 + if digit1 != 0XF: + mnc += digit1 * 10 + if digit2 != 0XF: + mnc += digit2 else: - mnc += digit1 * 100 - mnc += digit2 * 10 - mnc += digit3 + if digit1 != 0XF: + mnc += digit1 * 100 + if digit2 != 0XF: + mnc += digit2 * 10 + if digit3 != 0XF: + mnc += digit3 return mnc def dec_act(twohexbytes): @@ -182,7 +191,7 @@ if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: rec_str = "unused" else: - rec_str = "MCC: %3s MNC: %3s AcT: %s" % (rec_info['mcc'], rec_info['mnc'], ", ".join(rec_info['act'])) + rec_str = "MCC: %03d MNC: %03d AcT: %s" % (rec_info['mcc'], rec_info['mnc'], ", ".join(rec_info['act'])) s += "\t%s # %s\n" % (rec_data, rec_str) return s -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:00 +0000 Subject: Change in pysim[master]: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmo... References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card ...................................................................... Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 60 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/1 diff --git a/pySim/cards.py b/pySim/cards.py index 5d4d4f3..ff9c9b1 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -76,8 +76,10 @@ access_tech = 'FFFF' # All technologues selected, even Reserved for Future Use ones """ # get size and write EF.HPLMNwAcT - r = self._scc.select_file(EF['HPLMNwAcT']) - size = int(r[-1][4:8], 16) + #r = self._scc.select_file(EF['HPLMNwAcT']) + #size = int(r[-1][4:8], 16) + data = self._scc.read_binary(EF['HPLMNwAcT'], length=None, offset=0) + size = len(data[0])/2 hplmn = enc_plmn(mcc, mnc) content = hplmn + access_tech data, sw = self._scc.update_binary(EF['HPLMNwAcT'], content + 'ffffff0000' * (size/5-1)) @@ -85,11 +87,11 @@ def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): """ - See note in update_hplmn_act() + See note in update_hplmn_act() """ # get size and write EF.OPLMNwAcT - data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) - size = len(data[0])/2 + data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) + size = len(data[0])/2 hplmn = enc_plmn(mcc, mnc) content = hplmn + access_tech data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size/5-1)) @@ -97,19 +99,19 @@ def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): """ - See note in update_hplmn_act() + See note in update_hplmn_act() """ # get size and write EF.PLMNwAcT - data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) - size = len(data[0])/2 + data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) + size = len(data[0])/2 hplmn = enc_plmn(mcc, mnc) content = hplmn + access_tech data, sw = self._scc.update_binary(EF['PLMNwAcT'], content + 'ffffff0000' * (size/5-1)) return sw - def update_plmnsel(self, mcc, mnc): - data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0) - size = len(data[0])/2 + def update_plmnsel(self, mcc, mnc): + data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0) + size = len(data[0])/2 hplmn = enc_plmn(mcc, mnc) data, sw = self._scc.update_binary(EF['PLMNsel'], hplmn + 'ff' * (size-3)) return sw @@ -119,16 +121,16 @@ return sw def update_ad(self, mnc): - #See also: 3GPP TS 31.102, chapter 4.2.18 - mnclen = len(str(mnc)) - if mnclen == 1: - mnclen = 2 - if mnclen > 3: + #See also: 3GPP TS 31.102, chapter 4.2.18 + mnclen = len(str(mnc)) + if mnclen == 1: + mnclen = 2 + if mnclen > 3: raise RuntimeError('unable to calculate proper mnclen') - data = self._scc.read_binary(EF['AD'], length=None, offset=0) - size = len(data[0])/2 - content = data[0][0:6] + "%02X" % mnclen + data = self._scc.read_binary(EF['AD'], length=None, offset=0) + size = len(data[0])/2 + content = data[0][0:6] + "%02X" % mnclen data, sw = self._scc.update_binary(EF['AD'], content) return sw @@ -151,7 +153,7 @@ each possible provider uses a specific record number in each EF. The indexes used are ( where N is the number of providers supported ) : - [2 .. N+1] for the operator name - - [1 .. N] for the programable EFs + - [1 .. N] for the programable EFs * 3f00/7f4d/8f0c : Operator Name @@ -425,7 +427,7 @@ """ name = 'sysmosim-gr1' - @classmethod + @classmethod def autodetect(kls, scc): try: # Look for ATR @@ -593,25 +595,31 @@ data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) # EF.PLMNsel - if p.get('mcc') and p.get('mnc'): - sw = self.update_plmnsel(p['mcc'], p['mnc']) - if sw != '9000': - print("Programming PLMNsel failed with code %s"%sw) + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmnsel(p['mcc'], p['mnc']) + if sw != '9000': + rint("Programming PLMNsel failed with code %s"%sw) - # EF.PLMNwAcT - if p.get('mcc') and p.get('mnc'): + # EF.PLMNwAcT + if p.get('mcc') and p.get('mnc'): sw = self.update_plmn_act(p['mcc'], p['mnc']) if sw != '9000': print("Programming PLMNwAcT failed with code %s"%sw) - # EF.OPLMNwAcT - if p.get('mcc') and p.get('mnc'): + # EF.OPLMNwAcT + if p.get('mcc') and p.get('mnc'): sw = self.update_oplmn_act(p['mcc'], p['mnc']) if sw != '9000': print("Programming OPLMNwAcT failed with code %s"%sw) - # EF.AD - if p.get('mcc') and p.get('mnc'): + # EF.HPLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_hplmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming HPLMNwAcT failed with code %s"%sw) + + # EF.AD + if p.get('mcc') and p.get('mnc'): sw = self.update_ad(p['mnc']) if sw != '9000': print("Programming AD failed with code %s"%sw) @@ -848,28 +856,28 @@ if sw != '9000': raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],)) - # EF.ICCID - # TODO: Add programming of the ICCID - if p.get('iccid'): + # EF.ICCID + # TODO: Add programming of the ICCID + if p.get('iccid'): print("Warning: Programming of the ICCID is not implemented for this type of card.") - # KI (Presumably a propritary file) - # TODO: Add programming of KI - if p.get('ki'): + # KI (Presumably a propritary file) + # TODO: Add programming of KI + if p.get('ki'): print("Warning: Programming of the KI is not implemented for this type of card.") - # OPc (Presumably a propritary file) - # TODO: Add programming of OPc - if p.get('opc'): + # OPc (Presumably a propritary file) + # TODO: Add programming of OPc + if p.get('opc'): print("Warning: Programming of the OPc is not implemented for this type of card.") - # EF.SMSP + # EF.SMSP if p.get('smsp'): sw = self.update_smsp(p['smsp']) if sw != '9000': print("Programming SMSP failed with code %s"%sw) - # EF.IMSI + # EF.IMSI if p.get('imsi'): sw = self.update_imsi(p['imsi']) if sw != '9000': @@ -882,30 +890,30 @@ print("Programming ACC failed with code %s"%sw) # EF.PLMNsel - if p.get('mcc') and p.get('mnc'): - sw = self.update_plmnsel(p['mcc'], p['mnc']) - if sw != '9000': + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmnsel(p['mcc'], p['mnc']) + if sw != '9000': print("Programming PLMNsel failed with code %s"%sw) - # EF.PLMNwAcT - if p.get('mcc') and p.get('mnc'): + # EF.PLMNwAcT + if p.get('mcc') and p.get('mnc'): sw = self.update_plmn_act(p['mcc'], p['mnc']) if sw != '9000': print("Programming PLMNwAcT failed with code %s"%sw) - # EF.OPLMNwAcT - if p.get('mcc') and p.get('mnc'): + # EF.OPLMNwAcT + if p.get('mcc') and p.get('mnc'): sw = self.update_oplmn_act(p['mcc'], p['mnc']) if sw != '9000': print("Programming OPLMNwAcT failed with code %s"%sw) - # EF.AD - if p.get('mcc') and p.get('mnc'): + # EF.AD + if p.get('mcc') and p.get('mnc'): sw = self.update_ad(p['mnc']) if sw != '9000': print("Programming AD failed with code %s"%sw) - return None + return None def erase(self): return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:00 +0000 Subject: Change in pysim[master]: Initial implementation for programming MSISDN References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Initial implementation for programming MSISDN ...................................................................... Initial implementation for programming MSISDN Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 --- M pySim-prog.py 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/1 diff --git a/pySim-prog.py b/pySim-prog.py index 2638eef..739c7b1 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -157,6 +157,10 @@ help="Perform a 'dry run', don't actually program the card", default=False, action="store_true") + parser.add_option("--msisdn", dest="msisdn", + help="MSISDN", + ) + (options, args) = parser.parse_args() if options.type == 'list': @@ -262,6 +266,22 @@ # Digitize MCC/MNC (5 or 6 digits) plmn_digits = _mcc_mnc_digits(mcc, mnc) + if opts.name is not None and len(opts.name) > 16: + raise ValueError('Service Provider Name must max 16 characters!'); + name = opts.name + else: + name = None + + if opts.msisdn is not None: + if not _isnum(opts.msisdn): + raise ValueError('MSISDN must be digits only!'); + if len(opts.msisdn) > 10*2: + # Need to support MSISDN of length > 20 + raise ValueError('For now support for MSISDN of length <= 20 digits!'); + msisdn = opts.msisdn + else: + msisdn = None + # ICCID (19 digits, E.118), though some phase1 vendors use 20 :( if opts.iccid is not None: iccid = opts.iccid @@ -390,7 +410,7 @@ # Return that return { - 'name' : opts.name, + 'name' : name, 'iccid' : iccid, 'mcc' : mcc, 'mnc' : mnc, @@ -400,6 +420,7 @@ 'opc' : opc, 'acc' : acc, 'pin_adm' : pin_adm, + 'msisdn' : msisdn, } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:00 +0000 Subject: Change in pysim[master]: Further additions to reading USIM service table and fixed reading of ... References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Further additions to reading USIM service table and fixed reading of MSISDN parameter ...................................................................... Further additions to reading USIM service table and fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py 1 file changed, 24 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/1 diff --git a/pySim-read.py b/pySim-read.py index fa6ccd6..e9497d5 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -117,12 +117,20 @@ # EF.SST (res, sw) = scc.read_binary(EF['SST']) if sw == '9000': - # print("USIM Service Table: %s" % res) - if len(res) >= 23: - swapped = swap_nibbles(res) - byte12 = int(swapped[22:24], 16) - service95_support = (byte12&0x40 == 0x40) - print("Service n95 - Support of UICC access to IMS: %s" % service95_support) + swapped = swap_nibbles(res) + print("USIM Service Table: %s" % swapped) + if len(res) >= 24: + byte12 = int(swapped[(12*2) - 2:(12*2)], 16) + service96 = (byte12&0x80 == 0x80) + print("Service 96 - Non-Access Stratum configuration by USIM: %s" % service96) + service95 = (byte12&0x40 == 0x40) + print("Service 95 - Support of UICC access to IMS: %s" % service95) + service93 = (byte12&0x10 == 0x10) + print("Service 93 - Communication Control for IMS by USIM: %s" % service93) + if len(res) >= 6: + byte3 = int(swapped[(3*2) - 2:(3*2)], 16) + service21 = (byte3&0x10 == 0x10) + print("Service 21 - MSISDN: %s" % service21) else: print("USIM Service Table: Can't read, response code = %s" % (sw,)) @@ -195,10 +203,16 @@ # print(scc.record_size(['3f00', '7f10', '6f40'])) (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1) if sw == '9000': - if res[1] != 'f': - print("MSISDN: %s" % (res,)) - else: - print("MSISDN: Not available") + x_bytes = (len(res)/2) - 14 + bcd_len = res[(x_bytes * 2):(x_bytes * 2) + 2] + ton_npi = res[(x_bytes * 2) + 2:(x_bytes * 2) + 4] + dial_num = res[(x_bytes * 2) + 4:(x_bytes * 2) + 24] + # Refer 3GPP TS 24.008 Called party BCD number information element + print("MSISDN: %s" % (swap_nibbles(dial_num).rstrip('f'))) + # if res[1] != 'f': + # print("MSISDN: %s" % (res,)) + # else: + # print("MSISDN: Not available") else: print("MSISDN: Can't read, response code = %s" % (sw,)) except Exception as e: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:00 +0000 Subject: Change in pysim[master]: More additions to UST parse References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16948 ) Change subject: More additions to UST parse ...................................................................... More additions to UST parse Change-Id: I3896fcbde09fc843c68e597729ee3ba04e5ea3d0 --- M pySim-read.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/48/16948/1 diff --git a/pySim-read.py b/pySim-read.py index e9497d5..9e3d2f0 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -131,6 +131,12 @@ byte3 = int(swapped[(3*2) - 2:(3*2)], 16) service21 = (byte3&0x10 == 0x10) print("Service 21 - MSISDN: %s" % service21) + if len(res) >= 10: + byte5 = int(swapped[(5*2) - 2:(5*2)], 16) + service34 = (byte5&0x02 == 0x02) + service35 = (byte5&0x04 == 0x04) + print("Service 34 - Enabled Services Table: %s" % service34) + print("Service 35 - APN Control List (ACL): %s" % service35) else: print("USIM Service Table: Can't read, response code = %s" % (sw,)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3896fcbde09fc843c68e597729ee3ba04e5ea3d0 Gerrit-Change-Number: 16948 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:01 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:01 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Added support for MSISDN programming plus check for SPN length Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 --- M pySim-prog.py M pySim-read.py M pySim/cards.py 3 files changed, 38 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/16949/1 diff --git a/pySim-prog.py b/pySim-prog.py index 739c7b1..14ea11d 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -266,21 +266,21 @@ # Digitize MCC/MNC (5 or 6 digits) plmn_digits = _mcc_mnc_digits(mcc, mnc) - if opts.name is not None and len(opts.name) > 16: - raise ValueError('Service Provider Name must max 16 characters!'); + name = None + if opts.name is not None: + if len(opts.name) > 16: + raise ValueError('Service Provider Name must max 16 characters!'); name = opts.name - else: - name = None + msisdn = None if opts.msisdn is not None: - if not _isnum(opts.msisdn): - raise ValueError('MSISDN must be digits only!'); if len(opts.msisdn) > 10*2: - # Need to support MSISDN of length > 20 + # ToDo: Support MSISDN of length > 20 (10 Bytes) raise ValueError('For now support for MSISDN of length <= 20 digits!'); + if (len(opts.msisdn) % 2) != 0: + # ToDo: Support odd number of MSISDN digits + raise ValueError('For now support for only even number of MSISDN digits!'); msisdn = opts.msisdn - else: - msisdn = None # ICCID (19 digits, E.118), though some phase1 vendors use 20 :( if opts.iccid is not None: diff --git a/pySim-read.py b/pySim-read.py index 9e3d2f0..ff27b90 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -208,10 +208,14 @@ try: # print(scc.record_size(['3f00', '7f10', '6f40'])) (res, sw) = scc.read_record(['3f00', '7f10', '6f40'], 1) + #print res if sw == '9000': x_bytes = (len(res)/2) - 14 + #print res[(x_bytes * 2):] bcd_len = res[(x_bytes * 2):(x_bytes * 2) + 2] + #print bcd_len ton_npi = res[(x_bytes * 2) + 2:(x_bytes * 2) + 4] + #print ton_npi dial_num = res[(x_bytes * 2) + 4:(x_bytes * 2) + 24] # Refer 3GPP TS 24.008 Called party BCD number information element print("MSISDN: %s" % (swap_nibbles(dial_num).rstrip('f'))) diff --git a/pySim/cards.py b/pySim/cards.py index ff9c9b1..a7aa72c 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -588,8 +588,9 @@ data, sw = self._scc.update_binary('00F7', content) # set Service Provider Name - content = enc_spn(p['name'], True, True) - data, sw = self._scc.update_binary('6F46', rpad(content, 32)) + if p.get('name') is not None: + content = enc_spn(p['name'], True, True) + data, sw = self._scc.update_binary('6F46', rpad(content, 32)) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) @@ -628,6 +629,28 @@ r = self._scc.select_file(['3f00', '7f10']) data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) + # EF.MSISDN + if p.get('msisdn') is not None: + msisdn = p['msisdn'] + ton = "81" + if msisdn[0] == '+': + ton = "91" + msisdn = msisdn[1:] + l = -1 + if not (msisdn.isdigit() and ((l== -1) or (len(msisdn) == l))): + raise ValueError('MSISDN must be digits only!\n \ + Start with \'+\' for international numbers') + even_dig = ((len(msisdn) % 2) == 0) + if even_dig: + msisdn = '%02d' % ((len(msisdn)/2)+1,) + ton + swap_nibbles(rpad(msisdn, 24)) + else: + raise ValueError('MSISDN with even number of digits are supported for now!') + + msisdn = (('ff' * 20) + msisdn) + + r = self._scc.select_file(['3f00', '7f10']) + data, sw = self._scc.update_record('6F40', 1, msisdn, force_len=True) + def erase(self): return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:18:01 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:18:01 +0000 Subject: Change in pysim[master]: Added programming of ACC bits for sysmoUSIM-SJS1 References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16950 ) Change subject: Added programming of ACC bits for sysmoUSIM-SJS1 ...................................................................... Added programming of ACC bits for sysmoUSIM-SJS1 Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 --- M pySim/cards.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/16950/1 diff --git a/pySim/cards.py b/pySim/cards.py index a7aa72c..16c3e8e 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -592,6 +592,9 @@ content = enc_spn(p['name'], True, True) data, sw = self._scc.update_binary('6F46', rpad(content, 32)) + if p.get('acc') is not None: + self.update_acc(p['acc']) + # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 Gerrit-Change-Number: 16950 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:19:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 12:19:46 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 13: Code-Review+1 My comments regarding unnecessary pointers still apply. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 12:19:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 12:41:53 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 12:41:53 +0000 Subject: Change in pysim[master]: Merge remote gerrit onto local master References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16951 ) Change subject: Merge remote gerrit onto local master ...................................................................... Merge remote gerrit onto local master Change-Id: I187cbea985c705403c239a365505ac218d8b60a0 --- M pySim-prog.py M pySim/cards.py 3 files changed, 3 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/16951/1 diff --git a/pySim-prog.py b/pySim-prog.py index 20487b8..48292ec 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -165,15 +165,11 @@ parser.add_option("--dry-run", dest="dry_run", help="Perform a 'dry run', don't actually program the card", default=False, action="store_true") - -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) parser.add_option("--msisdn", dest="msisdn", help="MSISDN", ) -======= parser.add_option("--card_handler", dest="card_handler", metavar="FILE", help="Use automatic card handling machine") ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) (options, args) = parser.parse_args() diff --git a/pySim/cards.py b/pySim/cards.py index 31a8b60..249f6c5 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -87,11 +87,7 @@ def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): """ -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - See note in update_hplmn_act() -======= See note in update_hplmn_act() ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) """ # get size and write EF.OPLMNwAcT data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) @@ -103,11 +99,7 @@ def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): """ -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - See note in update_hplmn_act() -======= See note in update_hplmn_act() ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) """ # get size and write EF.PLMNwAcT data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) @@ -132,11 +124,7 @@ #See also: 3GPP TS 31.102, chapter 4.2.18 mnclen = len(str(mnc)) if mnclen == 1: -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - mnclen = 2 -======= mnclen = 2 ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) if mnclen > 3: raise RuntimeError('unable to calculate proper mnclen') @@ -622,9 +610,9 @@ data, sw = self._scc.update_binary('00FF', p['ki']) # set OPc in proprietary file -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - content = "01" + p['opc'] - data, sw = self._scc.update_binary('00F7', content) + if 'opc' in p: + content = "01" + p['opc'] + data, sw = self._scc.update_binary('00F7', content) # set Service Provider Name if p.get('name') is not None: @@ -633,11 +621,6 @@ if p.get('acc') is not None: self.update_acc(p['acc']) -======= - if 'opc' in p: - content = "01" + p['opc'] - data, sw = self._scc.update_binary('00F7', content) ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) @@ -646,11 +629,7 @@ if p.get('mcc') and p.get('mnc'): sw = self.update_plmnsel(p['mcc'], p['mnc']) if sw != '9000': -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - rint("Programming PLMNsel failed with code %s"%sw) -======= print("Programming PLMNsel failed with code %s"%sw) ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) # EF.PLMNwAcT if p.get('mcc') and p.get('mnc'): @@ -664,15 +643,12 @@ if sw != '9000': print("Programming OPLMNwAcT failed with code %s"%sw) -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) # EF.HPLMNwAcT if p.get('mcc') and p.get('mnc'): sw = self.update_hplmn_act(p['mcc'], p['mnc']) if sw != '9000': print("Programming HPLMNwAcT failed with code %s"%sw) -======= ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) # EF.AD if p.get('mcc') and p.get('mnc'): sw = self.update_ad(p['mnc']) @@ -955,11 +931,7 @@ if sw != '9000': print("Programming SMSP failed with code %s"%sw) -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - # EF.IMSI -======= # EF.IMSI ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) if p.get('imsi'): sw = self.update_imsi(p['imsi']) if sw != '9000': @@ -995,9 +967,6 @@ if sw != '9000': print("Programming AD failed with code %s"%sw) -<<<<<<< HEAD (59151e Added programming of ACC bits for sysmoUSIM-SJS1) - return None -======= return None def erase(self): @@ -1109,7 +1078,6 @@ self._scc.update_binary('af20', p['opc'], 17) return ->>>>>>> BRANCH (0ad5bc cards: Add support for sysmo-isim-sja2) def erase(self): return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I187cbea985c705403c239a365505ac218d8b60a0 Gerrit-Change-Number: 16951 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:00:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:00:52 +0000 Subject: Change in pysim[master]: Merge remote gerrit onto local master In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16951 ) Change subject: Merge remote gerrit onto local master ...................................................................... Patch Set 1: Code-Review-2 pleae rebaes your changes on top of current master. We generally don't do git merges in Osmocom, but try to have a linear git commit history with one commit on top of the other. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I187cbea985c705403c239a365505ac218d8b60a0 Gerrit-Change-Number: 16951 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:00:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:02:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:02:26 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/pysim/+/16940/1/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16940/1/pySim-read.py at 136 PS1, Line 136: (res, sw) = scc.read_binary(EF['PLMNsel']) : if sw == '9000': : print("PLMNsel: %s" % (res)) : else: : pri unrelated whitespace change. If you want to fix that, plase separate as separate commit marked as "cosmetic: fix up whitespace/indent" all over the file, but not mix functional and cosmetic changes in one commit. https://gerrit.osmocom.org/c/pysim/+/16940/1/pySim-read.py at 161 PS1, Line 161: except Exception as e: unrelated whitespace change. https://gerrit.osmocom.org/c/pysim/+/16940/1/pySim-read.py at 168 PS1, Line 168: unrelated whitespace change. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:02:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:03:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:03:05 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Patch Set 1: Code-Review+1 could possibly be merged into the patch that reads SPN -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:03:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:03:16 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 13:03:16 +0000 Subject: Change in pysim[master]: Merge remote gerrit onto local master In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16951 ) Change subject: Merge remote gerrit onto local master ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-2 > > pleae rebaes your changes on top of current master. We generally don't do git merges in Osmocom, but try to have a linear git commit history with one commit on top of the other. okay, I will rebase with gerrit master and re-submit for review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I187cbea985c705403c239a365505ac218d8b60a0 Gerrit-Change-Number: 16951 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:03:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:03:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:03:27 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:03:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:03:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 13:03:33 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Bind VTY to assigned IP addr References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16952 ) Change subject: ttcn3-pcu: Bind VTY to assigned IP addr ...................................................................... ttcn3-pcu: Bind VTY to assigned IP addr Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 --- M ttcn3-pcu-test/osmo-pcu.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/16952/1 diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg index d7ef445..326ad59 100644 --- a/ttcn3-pcu-test/osmo-pcu.cfg +++ b/ttcn3-pcu-test/osmo-pcu.cfg @@ -14,7 +14,7 @@ line vty no login - bind 0.0.0.0 + bind 172.18.13.101 pcu flow-control-interval 10 cs 2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 Gerrit-Change-Number: 16952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:04:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:04:24 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 20 Jan 2020 13:04:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:04:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:04:32 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:04:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:04:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 13:04:56 +0000 Subject: Change in pysim[master]: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmo... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card ...................................................................... Patch Set 1: please split the cosmetics from the functional changes. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:04:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:12:50 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 13:12:50 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 13:12:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:31:40 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 13:31:40 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16941 to look at the new patch set (#2). Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Added feature to program SPN into sysmoUSIM-SJS1 SIM cards Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce --- M pySim/cards.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/16941/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:31:40 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 13:31:40 +0000 Subject: Change in pysim[master]: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmo... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16945 to look at the new patch set (#2). Change subject: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card ...................................................................... Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:31:40 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 13:31:40 +0000 Subject: Change in pysim[master]: Initial implementation for programming MSISDN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16946 to look at the new patch set (#2). Change subject: Initial implementation for programming MSISDN ...................................................................... Initial implementation for programming MSISDN Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 --- M pySim-prog.py 1 file changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:37:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 20 Jan 2020 13:37:36 +0000 Subject: Change in osmo-hlr[master]: proxy routing refactor In-Reply-To: References: Message-ID: neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16762 ) Change subject: proxy routing refactor ...................................................................... Abandoned accidental submission of intermediate fixup patch -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I43ad27f6d768df02abb3459ac4c43bb80cc1cbeb Gerrit-Change-Number: 16762 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 13:50:41 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 13:50:41 +0000 Subject: Change in pysim[master]: Fixing mistakes of rebase References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16953 ) Change subject: Fixing mistakes of rebase ...................................................................... Fixing mistakes of rebase Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844 --- M pySim/cards.py 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/16953/1 diff --git a/pySim/cards.py b/pySim/cards.py index 1973fbd..249f6c5 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -87,11 +87,7 @@ def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): """ -<<<<<<< HEAD See note in update_hplmn_act() -======= - See note in update_hplmn_act() ->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card """ # get size and write EF.OPLMNwAcT data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) @@ -103,11 +99,7 @@ def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): """ -<<<<<<< HEAD See note in update_hplmn_act() -======= - See note in update_hplmn_act() ->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card """ # get size and write EF.PLMNwAcT data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) @@ -132,11 +124,7 @@ #See also: 3GPP TS 31.102, chapter 4.2.18 mnclen = len(str(mnc)) if mnclen == 1: -<<<<<<< HEAD mnclen = 2 -======= - mnclen = 2 ->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card if mnclen > 3: raise RuntimeError('unable to calculate proper mnclen') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844 Gerrit-Change-Number: 16953 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:27:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:27:34 +0000 Subject: Change in pysim[master]: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmo... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card ...................................................................... Patch Set 2: Code-Review+1 this looks good. only cosmetic change/idnent fix here. Might be best to first fix all the indents in one patch, and then have all of your actual functional changes on top. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:27:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:28:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:28:30 +0000 Subject: Change in pysim[master]: Initial implementation for programming MSISDN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Initial implementation for programming MSISDN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/2/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/2/pySim-prog.py at 279 PS2, Line 279: if opts.name is not None and len(opts.name) > 16: : raise ValueError('Service Provider Name must max 16 characters!'); : name = opts.name : else: : name = None this seesm to belong to another change, as it's not MSISDN -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:28:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:29:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:29:20 +0000 Subject: Change in pysim[master]: Further additions to reading USIM service table and fixed reading of ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Further additions to reading USIM service table and fixed reading of MSISDN parameter ...................................................................... Patch Set 2: those are two logically separate parts. Normally we'd have all changes for one feature (e.g. MSISDN) in one patch, and other functionality in other patches. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:29:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:29:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:29:52 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Patch Set 2: Code-Review-1 again two logically separate changes in one patch. Please split. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:29:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:29:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:29:58 +0000 Subject: Change in pysim[master]: Further additions to reading USIM service table and fixed reading of ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Further additions to reading USIM service table and fixed reading of MSISDN parameter ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:30:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:30:24 +0000 Subject: Change in pysim[master]: Added programming of ACC bits for sysmoUSIM-SJS1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16950 ) Change subject: Added programming of ACC bits for sysmoUSIM-SJS1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 Gerrit-Change-Number: 16950 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:30:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:30:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:30:43 +0000 Subject: Change in pysim[master]: Fixing mistakes of rebase In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16953 ) Change subject: Fixing mistakes of rebase ...................................................................... Patch Set 1: Code-Review-1 this should probabl be abandoned. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844 Gerrit-Change-Number: 16953 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:30:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:32:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:32:27 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 2: @dexter: I'm wondering why the verification fails here. The errors reported in HPLMNwACT etc. don't appear related to the changes supreet is making here. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:32:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:32:45 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 14:32:45 +0000 Subject: Change in pysim[master]: Merge remote gerrit onto local master In-Reply-To: References: Message-ID: herlesupreeth has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16951 ) Change subject: Merge remote gerrit onto local master ...................................................................... Abandoned Merge is not allowed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I187cbea985c705403c239a365505ac218d8b60a0 Gerrit-Change-Number: 16951 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:32:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:32:48 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Bind VTY to assigned IP addr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16952 ) Change subject: ttcn3-pcu: Bind VTY to assigned IP addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 Gerrit-Change-Number: 16952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 14:32:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:33:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:33:48 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:33:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:33:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:33:50 +0000 Subject: Change in osmo-bts[master]: ta_control: move timing advance code from osmo-bts-trx to common In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16885 ) Change subject: ta_control: move timing advance code from osmo-bts-trx to common ...................................................................... ta_control: move timing advance code from osmo-bts-trx to common The timing advance controller that is implemented in loops.c of osmo-bts-trx only works for osmo-bts-trx and not for any of the phy based bts. Lets move the timing advance controller into the common part and make it available for every bts. Also lets add a unit-test. Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: SYS#4567 --- M .gitignore M configure.ac M include/osmo-bts/Makefile.am M include/osmo-bts/phy_link.h A include/osmo-bts/ta_control.h M src/common/Makefile.am M src/common/measurement.c A src/common/ta_control.c M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_vty.c M tests/Makefile.am A tests/ta_control/Makefile.am A tests/ta_control/ta_control_test.c A tests/ta_control/ta_control_test.ok M tests/testsuite.at 18 files changed, 773 insertions(+), 81 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index a4b794a..7422edb 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ tests/misc/misc_test tests/handover/handover_test tests/tx_power/tx_power_test +tests/ta_control/ta_control_test tests/testsuite tests/testsuite.log diff --git a/configure.ac b/configure.ac index 1bcd2fe..55755ab 100644 --- a/configure.ac +++ b/configure.ac @@ -382,6 +382,7 @@ tests/sysmobts/Makefile tests/misc/Makefile tests/handover/Makefile + tests/ta_control/Makefile tests/tx_power/Makefile tests/power/Makefile tests/meas/Makefile diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index a15ce3d..668db32 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -2,4 +2,4 @@ oml.h paging.h rsl.h signal.h vty.h amr.h pcu_if.h pcuif_proto.h \ handover.h msg_utils.h tx_power.h control_if.h cbch.h l1sap.h \ power_control.h scheduler.h scheduler_backend.h phy_link.h \ - dtx_dl_amr_fsm.h + dtx_dl_amr_fsm.h ta_control.h diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index b2e7c0e..69c6bd6 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -44,7 +44,6 @@ uint16_t base_port_local; uint16_t base_port_remote; struct osmo_fd trx_ofd_clk; - bool trx_ta_loop; uint32_t clock_advance; uint32_t rts_advance; bool use_legacy_setbsic; diff --git a/include/osmo-bts/ta_control.h b/include/osmo-bts/ta_control.h new file mode 100644 index 0000000..168f14a --- /dev/null +++ b/include/osmo-bts/ta_control.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +void lchan_ms_ta_ctrl(struct gsm_lchan *lchan); diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 113ff2f..0a10abf 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -12,6 +12,6 @@ load_indication.c pcu_sock.c handover.c msg_utils.c \ tx_power.c bts_ctrl_commands.c bts_ctrl_lookup.c \ l1sap.c cbch.c power_control.c main.c phy_link.c \ - dtx_dl_amr_fsm.c scheduler_mframe.c + dtx_dl_amr_fsm.c scheduler_mframe.c ta_control.c libl1sched_a_SOURCES = scheduler.c diff --git a/src/common/measurement.c b/src/common/measurement.c index 3e0daf1..ddc1747 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -10,6 +10,7 @@ #include #include #include +#include /* Tables as per TS 45.008 Section 8.3 */ static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; @@ -696,6 +697,11 @@ lchan_meas_compute_extended(lchan); + /* Compute new ta_req value. This has to be done here since the value + * in lchan->meas.num_ul_meas together with lchan->meas.ms_toa256 + * is needed for the computation. */ + lchan_ms_ta_ctrl(lchan); + lchan->meas.num_ul_meas = 0; /* return 1 to indicate that the computation has been done and the next diff --git a/src/common/ta_control.c b/src/common/ta_control.c new file mode 100644 index 0000000..2ccc41a --- /dev/null +++ b/src/common/ta_control.c @@ -0,0 +1,55 @@ +/* Loop control for Timing Advance */ + +/* (C) 2013 by Andreas Eversberg + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +/* 90% of one bit duration in 1/256 symbols: 256*0.9 */ +#define TOA256_9OPERCENT 230 + +/* rqd_ta value range */ +#define TOA_MIN 0 +#define TOA_MAX 63 + +void lchan_ms_ta_ctrl(struct gsm_lchan *lchan) +{ + int16_t toa256 = lchan->meas.ms_toa256; + + /* Do not perform any computation when the amount of measurement + * results is too little. */ + if (lchan->meas.num_ul_meas < 4) + return; + + if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TOA_MIN) { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, + "TOA is too early (%d), now lowering TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta - 1); + lchan->rqd_ta--; + } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < TOA_MAX) { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, + "TOA is too late (%d), now raising TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta + 1); + lchan->rqd_ta++; + } else + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, + "TOA is correct (%d), keeping current TA of %d\n", + toa256, lchan->rqd_ta); +} diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index eb25f64..823c2d7 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -35,63 +35,6 @@ #include "l1_if.h" #include "loops.h" -/* - * Timing Advance loop - */ - -/* 90% of one bit duration in 1/256 symbols: 256*0.9 */ -#define TOA256_9OPERCENT 230 - -void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256) -{ - /* check if the current L1 header acks to the current ordered TA */ - if (lchan->meas.l1_info[1] != lchan->rqd_ta) - return; - - /* sum measurement */ - chan_state->meas.toa256_sum += toa256; - if (++(chan_state->meas.toa_num) < 16) - return; - - /* complete set */ - toa256 = chan_state->meas.toa256_sum / chan_state->meas.toa_num; - - /* check for change of TOA */ - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) { - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", - toa256, lchan->rqd_ta, lchan->rqd_ta - 1); - lchan->rqd_ta--; - } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", - toa256, lchan->rqd_ta, lchan->rqd_ta + 1); - lchan->rqd_ta++; - } else - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is correct (%d), keeping current TA of %d\n", - toa256, lchan->rqd_ta); - - chan_state->meas.toa_num = 0; - chan_state->meas.toa256_sum = 0; -} - -/*! Process a SACCH event as input to the MS power control and TA loop. Function - * is called once every uplink SACCH block is received. - * \param l1t L1 TRX instance on which we operate - * \param chan_nr RSL channel number on which we operate - * \param chan_state L1 scheduler channel state of the channel on which we operate - * \param[in] rssi Receive Signal Strength Indication - * \param[in] toa256 Time of Arrival in 1/256 symbol periods */ -void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa256) -{ - struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] - .lchan[l1sap_chan2ss(chan_nr)]; - struct phy_instance *pinst = trx_phy_instance(l1t->trx); - - /* if TA loop is enabled, handle it */ - if (pinst->phy_link->u.osmotrx.trx_ta_loop) - ta_val(lchan, chan_state, toa256); -} - void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int n_errors, int n_bits_total) diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h index bc87860..1384960 100644 --- a/src/osmo-bts-trx/loops.h +++ b/src/osmo-bts-trx/loops.h @@ -11,9 +11,6 @@ * loops api */ -void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa); - void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int n_errors, int n_bits_total); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 00280ce..6671243 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -135,7 +135,6 @@ plink->u.osmotrx.base_port_remote = 5700; plink->u.osmotrx.clock_advance = 20; plink->u.osmotrx.rts_advance = 5; - plink->u.osmotrx.trx_ta_loop = true; /* attempt use newest TRXD version by default: */ plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER; } diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 2785d09..20d502f 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -954,12 +954,6 @@ } else memset(burst, 0, 58 * 2); - /* send burst information to loops process */ - if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { - trx_loop_sacch_input(l1t, trx_chan_desc[chan].chan_nr | bi->tn, - chan_state, bi->toa256); - } - /* wait until complete set of bursts */ if (bid != 3) return 0; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 5c5e477..9c67a7f 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -181,23 +181,19 @@ return CMD_SUCCESS; } -DEFUN(cfg_phy_timing_advance_loop, cfg_phy_timing_advance_loop_cmd, +DEFUN_DEPRECATED(cfg_phy_timing_advance_loop, cfg_phy_timing_advance_loop_cmd, "osmotrx timing-advance-loop", OSMOTRX_STR "Enable timing advance control loop\n") { - struct phy_link *plink = vty->index; - - plink->u.osmotrx.trx_ta_loop = true; + vty_out (vty, "'osmotrx timing-advance-loop' is deprecated, ta control is now active by default%s", VTY_NEWLINE); return CMD_SUCCESS; } -DEFUN(cfg_phy_no_timing_advance_loop, cfg_phy_no_timing_advance_loop_cmd, +DEFUN_DEPRECATED(cfg_phy_no_timing_advance_loop, cfg_phy_no_timing_advance_loop_cmd, "no osmotrx timing-advance-loop", NO_STR OSMOTRX_STR "Disable timing advance control loop\n") { - struct phy_link *plink = vty->index; - - plink->u.osmotrx.trx_ta_loop = false; + vty_out (vty, "'no osmotrx timing-advance-loop' is deprecated, ta control is now active by default%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -522,8 +518,6 @@ vty_out(vty, " osmotrx ip remote %s%s", plink->u.osmotrx.remote_ip, VTY_NEWLINE); - vty_out(vty, " %sosmotrx timing-advance-loop%s", (plink->u.osmotrx.trx_ta_loop) ? "" : "no ", VTY_NEWLINE); - if (plink->u.osmotrx.base_port_local) vty_out(vty, " osmotrx base-port local %"PRIu16"%s", plink->u.osmotrx.base_port_local, VTY_NEWLINE); diff --git a/tests/Makefile.am b/tests/Makefile.am index 1eb28d6..57687ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = paging cipher agch misc handover tx_power power meas +SUBDIRS = paging cipher agch misc handover tx_power power meas ta_control if ENABLE_SYSMOBTS SUBDIRS += sysmobts diff --git a/tests/ta_control/Makefile.am b/tests/ta_control/Makefile.am new file mode 100644 index 0000000..4c89dd2 --- /dev/null +++ b/tests/ta_control/Makefile.am @@ -0,0 +1,6 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) +LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) +noinst_PROGRAMS = ta_control_test +EXTRA_DIST = ta_control_test.ok +ta_control_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/tests/ta_control/ta_control_test.c b/tests/ta_control/ta_control_test.c new file mode 100644 index 0000000..2e981b3 --- /dev/null +++ b/tests/ta_control/ta_control_test.c @@ -0,0 +1,77 @@ +/* Test cases for tx_control.c Timing Advance Computation */ + +/* (C) 2016 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#include + +#include +#include +#include +#include +#include + +void lchan_ms_ta_ctrl_test(int16_t toa256_start, unsigned int steps) +{ + struct gsm_lchan lchan = { }; + unsigned int i; + uint8_t rqd_ta_after; + uint8_t rqd_ta_before; + int16_t toa256 = toa256_start; + + /* Arbitrary value, high enough so that a computation can happen. */ + lchan.meas.num_ul_meas = 10; + + printf("toa256_start = %u / 256 = %u, steps = %u\n", toa256_start, + toa256_start / 256, steps); + + for (i = 0; i < steps; i++) { + printf("Step #%u\n", i); + printf(" lchan.rqd_ta (before) = %u\n", lchan.rqd_ta); + printf(" toa256 (before) = %u / 256 = %u\n", toa256, + toa256 / 256); + + rqd_ta_before = lchan.rqd_ta; + + lchan.meas.ms_toa256 = toa256; + lchan_ms_ta_ctrl(&lchan); + + rqd_ta_after = lchan.rqd_ta; + toa256 -= (rqd_ta_after - rqd_ta_before) * 256; + + printf(" lchan.rqd_ta (after) = %u\n", lchan.rqd_ta); + printf(" toa256 (after) = %u / 256 = %u\n", toa256, + toa256 / 256); + } + + printf("Done.\n"); + printf("\n"); +} + +int main(int argc, char **argv) +{ + void *tall_bts_ctx; + + tall_bts_ctx = talloc_named_const(NULL, 1, "OsmoBTS context"); + osmo_init_logging2(tall_bts_ctx, &bts_log_info); + + lchan_ms_ta_ctrl_test(16 * 256, 20); + lchan_ms_ta_ctrl_test(4000, 50); + lchan_ms_ta_ctrl_test(12345, 50); +} diff --git a/tests/ta_control/ta_control_test.ok b/tests/ta_control/ta_control_test.ok new file mode 100644 index 0000000..8ebe5d5 --- /dev/null +++ b/tests/ta_control/ta_control_test.ok @@ -0,0 +1,609 @@ +toa256_start = 4096 / 256 = 16, steps = 20 +Step #0 + lchan.rqd_ta (before) = 0 + toa256 (before) = 4096 / 256 = 16 + lchan.rqd_ta (after) = 1 + toa256 (after) = 3840 / 256 = 15 +Step #1 + lchan.rqd_ta (before) = 1 + toa256 (before) = 3840 / 256 = 15 + lchan.rqd_ta (after) = 2 + toa256 (after) = 3584 / 256 = 14 +Step #2 + lchan.rqd_ta (before) = 2 + toa256 (before) = 3584 / 256 = 14 + lchan.rqd_ta (after) = 3 + toa256 (after) = 3328 / 256 = 13 +Step #3 + lchan.rqd_ta (before) = 3 + toa256 (before) = 3328 / 256 = 13 + lchan.rqd_ta (after) = 4 + toa256 (after) = 3072 / 256 = 12 +Step #4 + lchan.rqd_ta (before) = 4 + toa256 (before) = 3072 / 256 = 12 + lchan.rqd_ta (after) = 5 + toa256 (after) = 2816 / 256 = 11 +Step #5 + lchan.rqd_ta (before) = 5 + toa256 (before) = 2816 / 256 = 11 + lchan.rqd_ta (after) = 6 + toa256 (after) = 2560 / 256 = 10 +Step #6 + lchan.rqd_ta (before) = 6 + toa256 (before) = 2560 / 256 = 10 + lchan.rqd_ta (after) = 7 + toa256 (after) = 2304 / 256 = 9 +Step #7 + lchan.rqd_ta (before) = 7 + toa256 (before) = 2304 / 256 = 9 + lchan.rqd_ta (after) = 8 + toa256 (after) = 2048 / 256 = 8 +Step #8 + lchan.rqd_ta (before) = 8 + toa256 (before) = 2048 / 256 = 8 + lchan.rqd_ta (after) = 9 + toa256 (after) = 1792 / 256 = 7 +Step #9 + lchan.rqd_ta (before) = 9 + toa256 (before) = 1792 / 256 = 7 + lchan.rqd_ta (after) = 10 + toa256 (after) = 1536 / 256 = 6 +Step #10 + lchan.rqd_ta (before) = 10 + toa256 (before) = 1536 / 256 = 6 + lchan.rqd_ta (after) = 11 + toa256 (after) = 1280 / 256 = 5 +Step #11 + lchan.rqd_ta (before) = 11 + toa256 (before) = 1280 / 256 = 5 + lchan.rqd_ta (after) = 12 + toa256 (after) = 1024 / 256 = 4 +Step #12 + lchan.rqd_ta (before) = 12 + toa256 (before) = 1024 / 256 = 4 + lchan.rqd_ta (after) = 13 + toa256 (after) = 768 / 256 = 3 +Step #13 + lchan.rqd_ta (before) = 13 + toa256 (before) = 768 / 256 = 3 + lchan.rqd_ta (after) = 14 + toa256 (after) = 512 / 256 = 2 +Step #14 + lchan.rqd_ta (before) = 14 + toa256 (before) = 512 / 256 = 2 + lchan.rqd_ta (after) = 15 + toa256 (after) = 256 / 256 = 1 +Step #15 + lchan.rqd_ta (before) = 15 + toa256 (before) = 256 / 256 = 1 + lchan.rqd_ta (after) = 16 + toa256 (after) = 0 / 256 = 0 +Step #16 + lchan.rqd_ta (before) = 16 + toa256 (before) = 0 / 256 = 0 + lchan.rqd_ta (after) = 16 + toa256 (after) = 0 / 256 = 0 +Step #17 + lchan.rqd_ta (before) = 16 + toa256 (before) = 0 / 256 = 0 + lchan.rqd_ta (after) = 16 + toa256 (after) = 0 / 256 = 0 +Step #18 + lchan.rqd_ta (before) = 16 + toa256 (before) = 0 / 256 = 0 + lchan.rqd_ta (after) = 16 + toa256 (after) = 0 / 256 = 0 +Step #19 + lchan.rqd_ta (before) = 16 + toa256 (before) = 0 / 256 = 0 + lchan.rqd_ta (after) = 16 + toa256 (after) = 0 / 256 = 0 +Done. + +toa256_start = 4000 / 256 = 15, steps = 50 +Step #0 + lchan.rqd_ta (before) = 0 + toa256 (before) = 4000 / 256 = 15 + lchan.rqd_ta (after) = 1 + toa256 (after) = 3744 / 256 = 14 +Step #1 + lchan.rqd_ta (before) = 1 + toa256 (before) = 3744 / 256 = 14 + lchan.rqd_ta (after) = 2 + toa256 (after) = 3488 / 256 = 13 +Step #2 + lchan.rqd_ta (before) = 2 + toa256 (before) = 3488 / 256 = 13 + lchan.rqd_ta (after) = 3 + toa256 (after) = 3232 / 256 = 12 +Step #3 + lchan.rqd_ta (before) = 3 + toa256 (before) = 3232 / 256 = 12 + lchan.rqd_ta (after) = 4 + toa256 (after) = 2976 / 256 = 11 +Step #4 + lchan.rqd_ta (before) = 4 + toa256 (before) = 2976 / 256 = 11 + lchan.rqd_ta (after) = 5 + toa256 (after) = 2720 / 256 = 10 +Step #5 + lchan.rqd_ta (before) = 5 + toa256 (before) = 2720 / 256 = 10 + lchan.rqd_ta (after) = 6 + toa256 (after) = 2464 / 256 = 9 +Step #6 + lchan.rqd_ta (before) = 6 + toa256 (before) = 2464 / 256 = 9 + lchan.rqd_ta (after) = 7 + toa256 (after) = 2208 / 256 = 8 +Step #7 + lchan.rqd_ta (before) = 7 + toa256 (before) = 2208 / 256 = 8 + lchan.rqd_ta (after) = 8 + toa256 (after) = 1952 / 256 = 7 +Step #8 + lchan.rqd_ta (before) = 8 + toa256 (before) = 1952 / 256 = 7 + lchan.rqd_ta (after) = 9 + toa256 (after) = 1696 / 256 = 6 +Step #9 + lchan.rqd_ta (before) = 9 + toa256 (before) = 1696 / 256 = 6 + lchan.rqd_ta (after) = 10 + toa256 (after) = 1440 / 256 = 5 +Step #10 + lchan.rqd_ta (before) = 10 + toa256 (before) = 1440 / 256 = 5 + lchan.rqd_ta (after) = 11 + toa256 (after) = 1184 / 256 = 4 +Step #11 + lchan.rqd_ta (before) = 11 + toa256 (before) = 1184 / 256 = 4 + lchan.rqd_ta (after) = 12 + toa256 (after) = 928 / 256 = 3 +Step #12 + lchan.rqd_ta (before) = 12 + toa256 (before) = 928 / 256 = 3 + lchan.rqd_ta (after) = 13 + toa256 (after) = 672 / 256 = 2 +Step #13 + lchan.rqd_ta (before) = 13 + toa256 (before) = 672 / 256 = 2 + lchan.rqd_ta (after) = 14 + toa256 (after) = 416 / 256 = 1 +Step #14 + lchan.rqd_ta (before) = 14 + toa256 (before) = 416 / 256 = 1 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #15 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #16 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #17 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #18 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #19 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #20 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #21 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #22 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #23 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #24 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #25 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #26 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #27 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #28 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #29 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #30 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #31 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #32 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #33 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #34 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #35 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #36 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #37 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #38 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #39 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #40 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #41 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #42 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #43 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #44 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #45 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #46 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #47 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #48 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Step #49 + lchan.rqd_ta (before) = 15 + toa256 (before) = 160 / 256 = 0 + lchan.rqd_ta (after) = 15 + toa256 (after) = 160 / 256 = 0 +Done. + +toa256_start = 12345 / 256 = 48, steps = 50 +Step #0 + lchan.rqd_ta (before) = 0 + toa256 (before) = 12345 / 256 = 48 + lchan.rqd_ta (after) = 1 + toa256 (after) = 12089 / 256 = 47 +Step #1 + lchan.rqd_ta (before) = 1 + toa256 (before) = 12089 / 256 = 47 + lchan.rqd_ta (after) = 2 + toa256 (after) = 11833 / 256 = 46 +Step #2 + lchan.rqd_ta (before) = 2 + toa256 (before) = 11833 / 256 = 46 + lchan.rqd_ta (after) = 3 + toa256 (after) = 11577 / 256 = 45 +Step #3 + lchan.rqd_ta (before) = 3 + toa256 (before) = 11577 / 256 = 45 + lchan.rqd_ta (after) = 4 + toa256 (after) = 11321 / 256 = 44 +Step #4 + lchan.rqd_ta (before) = 4 + toa256 (before) = 11321 / 256 = 44 + lchan.rqd_ta (after) = 5 + toa256 (after) = 11065 / 256 = 43 +Step #5 + lchan.rqd_ta (before) = 5 + toa256 (before) = 11065 / 256 = 43 + lchan.rqd_ta (after) = 6 + toa256 (after) = 10809 / 256 = 42 +Step #6 + lchan.rqd_ta (before) = 6 + toa256 (before) = 10809 / 256 = 42 + lchan.rqd_ta (after) = 7 + toa256 (after) = 10553 / 256 = 41 +Step #7 + lchan.rqd_ta (before) = 7 + toa256 (before) = 10553 / 256 = 41 + lchan.rqd_ta (after) = 8 + toa256 (after) = 10297 / 256 = 40 +Step #8 + lchan.rqd_ta (before) = 8 + toa256 (before) = 10297 / 256 = 40 + lchan.rqd_ta (after) = 9 + toa256 (after) = 10041 / 256 = 39 +Step #9 + lchan.rqd_ta (before) = 9 + toa256 (before) = 10041 / 256 = 39 + lchan.rqd_ta (after) = 10 + toa256 (after) = 9785 / 256 = 38 +Step #10 + lchan.rqd_ta (before) = 10 + toa256 (before) = 9785 / 256 = 38 + lchan.rqd_ta (after) = 11 + toa256 (after) = 9529 / 256 = 37 +Step #11 + lchan.rqd_ta (before) = 11 + toa256 (before) = 9529 / 256 = 37 + lchan.rqd_ta (after) = 12 + toa256 (after) = 9273 / 256 = 36 +Step #12 + lchan.rqd_ta (before) = 12 + toa256 (before) = 9273 / 256 = 36 + lchan.rqd_ta (after) = 13 + toa256 (after) = 9017 / 256 = 35 +Step #13 + lchan.rqd_ta (before) = 13 + toa256 (before) = 9017 / 256 = 35 + lchan.rqd_ta (after) = 14 + toa256 (after) = 8761 / 256 = 34 +Step #14 + lchan.rqd_ta (before) = 14 + toa256 (before) = 8761 / 256 = 34 + lchan.rqd_ta (after) = 15 + toa256 (after) = 8505 / 256 = 33 +Step #15 + lchan.rqd_ta (before) = 15 + toa256 (before) = 8505 / 256 = 33 + lchan.rqd_ta (after) = 16 + toa256 (after) = 8249 / 256 = 32 +Step #16 + lchan.rqd_ta (before) = 16 + toa256 (before) = 8249 / 256 = 32 + lchan.rqd_ta (after) = 17 + toa256 (after) = 7993 / 256 = 31 +Step #17 + lchan.rqd_ta (before) = 17 + toa256 (before) = 7993 / 256 = 31 + lchan.rqd_ta (after) = 18 + toa256 (after) = 7737 / 256 = 30 +Step #18 + lchan.rqd_ta (before) = 18 + toa256 (before) = 7737 / 256 = 30 + lchan.rqd_ta (after) = 19 + toa256 (after) = 7481 / 256 = 29 +Step #19 + lchan.rqd_ta (before) = 19 + toa256 (before) = 7481 / 256 = 29 + lchan.rqd_ta (after) = 20 + toa256 (after) = 7225 / 256 = 28 +Step #20 + lchan.rqd_ta (before) = 20 + toa256 (before) = 7225 / 256 = 28 + lchan.rqd_ta (after) = 21 + toa256 (after) = 6969 / 256 = 27 +Step #21 + lchan.rqd_ta (before) = 21 + toa256 (before) = 6969 / 256 = 27 + lchan.rqd_ta (after) = 22 + toa256 (after) = 6713 / 256 = 26 +Step #22 + lchan.rqd_ta (before) = 22 + toa256 (before) = 6713 / 256 = 26 + lchan.rqd_ta (after) = 23 + toa256 (after) = 6457 / 256 = 25 +Step #23 + lchan.rqd_ta (before) = 23 + toa256 (before) = 6457 / 256 = 25 + lchan.rqd_ta (after) = 24 + toa256 (after) = 6201 / 256 = 24 +Step #24 + lchan.rqd_ta (before) = 24 + toa256 (before) = 6201 / 256 = 24 + lchan.rqd_ta (after) = 25 + toa256 (after) = 5945 / 256 = 23 +Step #25 + lchan.rqd_ta (before) = 25 + toa256 (before) = 5945 / 256 = 23 + lchan.rqd_ta (after) = 26 + toa256 (after) = 5689 / 256 = 22 +Step #26 + lchan.rqd_ta (before) = 26 + toa256 (before) = 5689 / 256 = 22 + lchan.rqd_ta (after) = 27 + toa256 (after) = 5433 / 256 = 21 +Step #27 + lchan.rqd_ta (before) = 27 + toa256 (before) = 5433 / 256 = 21 + lchan.rqd_ta (after) = 28 + toa256 (after) = 5177 / 256 = 20 +Step #28 + lchan.rqd_ta (before) = 28 + toa256 (before) = 5177 / 256 = 20 + lchan.rqd_ta (after) = 29 + toa256 (after) = 4921 / 256 = 19 +Step #29 + lchan.rqd_ta (before) = 29 + toa256 (before) = 4921 / 256 = 19 + lchan.rqd_ta (after) = 30 + toa256 (after) = 4665 / 256 = 18 +Step #30 + lchan.rqd_ta (before) = 30 + toa256 (before) = 4665 / 256 = 18 + lchan.rqd_ta (after) = 31 + toa256 (after) = 4409 / 256 = 17 +Step #31 + lchan.rqd_ta (before) = 31 + toa256 (before) = 4409 / 256 = 17 + lchan.rqd_ta (after) = 32 + toa256 (after) = 4153 / 256 = 16 +Step #32 + lchan.rqd_ta (before) = 32 + toa256 (before) = 4153 / 256 = 16 + lchan.rqd_ta (after) = 33 + toa256 (after) = 3897 / 256 = 15 +Step #33 + lchan.rqd_ta (before) = 33 + toa256 (before) = 3897 / 256 = 15 + lchan.rqd_ta (after) = 34 + toa256 (after) = 3641 / 256 = 14 +Step #34 + lchan.rqd_ta (before) = 34 + toa256 (before) = 3641 / 256 = 14 + lchan.rqd_ta (after) = 35 + toa256 (after) = 3385 / 256 = 13 +Step #35 + lchan.rqd_ta (before) = 35 + toa256 (before) = 3385 / 256 = 13 + lchan.rqd_ta (after) = 36 + toa256 (after) = 3129 / 256 = 12 +Step #36 + lchan.rqd_ta (before) = 36 + toa256 (before) = 3129 / 256 = 12 + lchan.rqd_ta (after) = 37 + toa256 (after) = 2873 / 256 = 11 +Step #37 + lchan.rqd_ta (before) = 37 + toa256 (before) = 2873 / 256 = 11 + lchan.rqd_ta (after) = 38 + toa256 (after) = 2617 / 256 = 10 +Step #38 + lchan.rqd_ta (before) = 38 + toa256 (before) = 2617 / 256 = 10 + lchan.rqd_ta (after) = 39 + toa256 (after) = 2361 / 256 = 9 +Step #39 + lchan.rqd_ta (before) = 39 + toa256 (before) = 2361 / 256 = 9 + lchan.rqd_ta (after) = 40 + toa256 (after) = 2105 / 256 = 8 +Step #40 + lchan.rqd_ta (before) = 40 + toa256 (before) = 2105 / 256 = 8 + lchan.rqd_ta (after) = 41 + toa256 (after) = 1849 / 256 = 7 +Step #41 + lchan.rqd_ta (before) = 41 + toa256 (before) = 1849 / 256 = 7 + lchan.rqd_ta (after) = 42 + toa256 (after) = 1593 / 256 = 6 +Step #42 + lchan.rqd_ta (before) = 42 + toa256 (before) = 1593 / 256 = 6 + lchan.rqd_ta (after) = 43 + toa256 (after) = 1337 / 256 = 5 +Step #43 + lchan.rqd_ta (before) = 43 + toa256 (before) = 1337 / 256 = 5 + lchan.rqd_ta (after) = 44 + toa256 (after) = 1081 / 256 = 4 +Step #44 + lchan.rqd_ta (before) = 44 + toa256 (before) = 1081 / 256 = 4 + lchan.rqd_ta (after) = 45 + toa256 (after) = 825 / 256 = 3 +Step #45 + lchan.rqd_ta (before) = 45 + toa256 (before) = 825 / 256 = 3 + lchan.rqd_ta (after) = 46 + toa256 (after) = 569 / 256 = 2 +Step #46 + lchan.rqd_ta (before) = 46 + toa256 (before) = 569 / 256 = 2 + lchan.rqd_ta (after) = 47 + toa256 (after) = 313 / 256 = 1 +Step #47 + lchan.rqd_ta (before) = 47 + toa256 (before) = 313 / 256 = 1 + lchan.rqd_ta (after) = 48 + toa256 (after) = 57 / 256 = 0 +Step #48 + lchan.rqd_ta (before) = 48 + toa256 (before) = 57 / 256 = 0 + lchan.rqd_ta (after) = 48 + toa256 (after) = 57 / 256 = 0 +Step #49 + lchan.rqd_ta (before) = 48 + toa256 (before) = 57 / 256 = 0 + lchan.rqd_ta (after) = 48 + toa256 (after) = 57 / 256 = 0 +Done. + diff --git a/tests/testsuite.at b/tests/testsuite.at index 2d1cefd..d9bc1ce 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -49,3 +49,9 @@ cat $abs_srcdir/meas/meas_test.ok > expout AT_CHECK([$abs_top_builddir/tests/meas/meas_test], [], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([ta_control]) +AT_KEYWORDS([ta_control]) +cat $abs_srcdir/ta_control/ta_control_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/ta_control/ta_control_test], [], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Gerrit-Change-Number: 16885 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:33:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:33:52 +0000 Subject: Change in osmo-bts[master]: measurment: write irssi_full_sum variable correctly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16939 ) Change subject: measurment: write irssi_full_sum variable correctly ...................................................................... measurment: write irssi_full_sum variable correctly The variable irssi_full_sum is not populated with a dummy value when we are not able to compute irssi_full_sum. Instead we mistakenly write MEASUREMENT_DUMMY_IRSSI to ber_full_sum, which is wrong Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Related: OS#2987 --- M src/common/measurement.c M tests/meas/meas_test.ok M tests/meas/meas_testcases.h 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index ddc1747..b883d51 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -656,7 +656,7 @@ ber_full_sum = ber_full_sum / num_ul_meas; if (!irssi_full_sum) - ber_full_sum = MEASUREMENT_DUMMY_IRSSI; + irssi_full_sum = MEASUREMENT_DUMMY_IRSSI; else irssi_full_sum = irssi_full_sum / num_ul_meas_actual; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index e62bb42..559a8e6 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -585,8 +585,8 @@ meas.ext.toa256_max | 0 | 0 meas.ms_toa256 | 0 | 0 meas.ext.toa256_std_dev | 0 | 0 -meas.ul_res.full.rx_lev | 63 | 63 -meas.ul_res.full.rx_qual | 3 | 3 +meas.ul_res.full.rx_lev | 1 | 1 +meas.ul_res.full.rx_qual | 7 | 7 =========================================================== diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h index fefa34f..d7eee5c 100644 --- a/tests/meas/meas_testcases.h +++ b/tests/meas/meas_testcases.h @@ -131,8 +131,8 @@ .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, - .rx_lev_full = 63, - .rx_qual_full = 3, + .rx_lev_full = 1, + .rx_qual_full = 7, .toa256_mean = 0, .toa256_max = 0, .toa256_min = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Gerrit-Change-Number: 16939 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:35:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:35:18 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 13: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:35:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:35:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:35:20 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 128 insertions(+), 99 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 41998ad..e0d70b0 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -479,6 +479,11 @@ BTS_FEAT_SPEECH_H_AMR, BTS_FEAT_ETWS_PN, BTS_FEAT_MS_PWR_CTRL_DSP, + /* When the feature is set then the measurement data is included in + * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the + * measurement data is passed using a separate MPH INFO MEAS IND. + * (See also ticket: OS#2977) */ + BTS_FEAT_MEAS_PAYLOAD_COMB, _NUM_BTS_FEAT }; diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 51c957c..aa2d6e9 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -54,7 +54,8 @@ enum osmo_ph_pres_info_type presence_info); int _sched_compose_tch_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, - enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len); + enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len, + int16_t ta_offs_256bits, uint16_t ber10k, float rssi); ubit_t *tx_idle_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, enum trx_chan_type chan, uint8_t bid, uint16_t *nbits); diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index b31d458..c4a60b5 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -109,6 +109,7 @@ { BTS_FEAT_SPEECH_H_AMR, "Halfrate speech AMR" }, { BTS_FEAT_ETWS_PN, "ETWS Primary Notification on PCH" }, { BTS_FEAT_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" }, + { BTS_FEAT_MEAS_PAYLOAD_COMB, "Measurement and Payload data combined"}, { 0, NULL } }; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 889f7f6..21f3a8a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -629,42 +629,93 @@ } /* measurement information received from bts model */ -static int l1sap_info_meas_ind(struct gsm_bts_trx *trx, - struct osmo_phsap_prim *l1sap, - struct info_meas_ind_param *info_meas_ind) +static void process_l1sap_meas_data(struct gsm_bts_trx *trx, + struct osmo_phsap_prim *l1sap, + enum osmo_ph_prim ind_type) { struct bts_ul_meas ulm; struct gsm_lchan *lchan; + struct info_meas_ind_param *info_meas_ind; + struct ph_data_param *ph_data_ind; + struct ph_tch_param *ph_tch_ind; + uint8_t chan_nr; + uint32_t fn; + uint8_t inv_rssi; + uint8_t is_sub; + int16_t ta_offs_256bits; + uint16_t ber10k; + const char *ind_name; - lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); - if (!lchan) { - LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n", rsl_chan_nr_str(info_meas_ind->chan_nr)); - return 0; + switch (ind_type) { + case PRIM_MPH_INFO: + /* (legacy way, see also OS#2977) */ + info_meas_ind = &l1sap->u.info.u.meas_ind; + chan_nr = info_meas_ind->chan_nr; + fn = info_meas_ind->fn; + inv_rssi = info_meas_ind->inv_rssi; + is_sub = info_meas_ind->is_sub; + ta_offs_256bits = info_meas_ind->ta_offs_256bits; + ber10k = info_meas_ind->ber10k; + ind_name = "MPH INFO"; + break; + case PRIM_TCH: + ph_tch_ind = &l1sap->u.tch; + if (ph_tch_ind->rssi == 0) + return; + chan_nr = ph_tch_ind->chan_nr; + fn = ph_tch_ind->fn; + inv_rssi = abs(ph_tch_ind->rssi); + is_sub = ph_tch_ind->is_sub; + ta_offs_256bits = ph_tch_ind->ta_offs_256bits; + ber10k = ph_tch_ind->ber10k; + ind_name = "TCH"; + break; + case PRIM_PH_DATA: + ph_data_ind = &l1sap->u.data; + if (ph_data_ind->rssi == 0) + return; + chan_nr = ph_data_ind->chan_nr; + fn = ph_data_ind->fn; + inv_rssi = abs(ph_data_ind->rssi); + is_sub = ph_data_ind->is_sub; + ta_offs_256bits = ph_data_ind->ta_offs_256bits; + ber10k = ph_data_ind->ber10k; + ind_name = "DATA"; + break; + default: + OSMO_ASSERT(false); } - DEBUGPFN(DL1P, info_meas_ind->fn, - "%s MPH_INFO meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u\n", - gsm_lchan_name(lchan), info_meas_ind->ta_offs_256bits, - info_meas_ind->ber10k, info_meas_ind->inv_rssi); + lchan = get_active_lchan_by_chan_nr(trx, chan_nr); + if (!lchan) { + LOGPFN(DL1P, LOGL_ERROR, fn, + "No lchan for %s MEAS IND (chan_nr=%s)\n", + ind_name, rsl_chan_nr_str(chan_nr)); + return; + } + + DEBUGPFN(DL1P, fn, + "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u\n", + gsm_lchan_name(lchan), ind_name, ta_offs_256bits, ber10k, + inv_rssi); /* in the GPRS case we are not interested in measurement * processing. The PCU will take care of it */ if (lchan->type == GSM_LCHAN_PDTCH) - return 0; + return; memset(&ulm, 0, sizeof(ulm)); - ulm.ta_offs_256bits = info_meas_ind->ta_offs_256bits; - ulm.ber10k = info_meas_ind->ber10k; - ulm.inv_rssi = info_meas_ind->inv_rssi; - ulm.is_sub = info_meas_ind->is_sub; + ulm.ta_offs_256bits = ta_offs_256bits; + ulm.ber10k = ber10k; + ulm.inv_rssi = inv_rssi; + ulm.is_sub = is_sub; /* we assume that symbol period is 1 bit: */ - set_ms_to_data(lchan, info_meas_ind->ta_offs_256bits / 256, true); + set_ms_to_data(lchan, ta_offs_256bits / 256, true); - lchan_meas_process_measurement(lchan, &ulm, info_meas_ind->fn); + lchan_meas_process_measurement(lchan, &ulm, fn); - return 0; + return; } /* any L1 MPH_INFO indication prim received from bts model */ @@ -685,7 +736,12 @@ &info->u.time_ind); break; case PRIM_INFO_MEAS: - rc = l1sap_info_meas_ind(trx, l1sap, &info->u.meas_ind); + /* We should never get an INFO_IND with PRIM_INFO_MEAS + * when BTS_FEAT_MEAS_PAYLOAD_COMB is enabled */ + if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) + OSMO_ASSERT(false); + + process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); break; default: LOGP(DL1P, LOGL_NOTICE, "unknown MPH_INFO ind type %d\n", @@ -1200,6 +1256,12 @@ return -EINVAL; } + /* The ph_data_param contained in the l1sap primitive may contain + * measurement data. If this data is present, forward it for + * processing */ + if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) + process_l1sap_meas_data(trx, l1sap, PRIM_PH_DATA); + if (ts_is_pdch(&trx->ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) @@ -1315,6 +1377,12 @@ return 0; } + /* The ph_tch_param contained in the l1sap primitive may contain + * measurement data. If this data is present, forward it for + * processing */ + if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) + process_l1sap_meas_data(trx, l1sap, PRIM_TCH); + msgb_pull(msg, sizeof(*l1sap)); /* Low level layers always call us when TCH content is expected, even if diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 3713b06..e8df537 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -753,7 +753,8 @@ } int _sched_compose_tch_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, - enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len) + enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len, + int16_t ta_offs_256bits, uint16_t ber10k, float rssi) { struct msgb *msg; struct osmo_phsap_prim *l1sap; @@ -769,6 +770,10 @@ PRIM_OP_INDICATION, msg); l1sap->u.tch.chan_nr = chan_nr; l1sap->u.tch.fn = fn; + l1sap->u.tch.rssi = (int8_t) (rssi); + l1sap->u.tch.ber10k = ber10k; + l1sap->u.tch.ta_offs_256bits = ta_offs_256bits; + msg->l2h = msgb_put(msg, tch_len); if (tch_len) memcpy(msg->l2h, tch, tch_len); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 38b43b9..b28c894 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -572,40 +572,6 @@ return l1sap_up(bts->c0, &l1sap); } - -static void l1if_fill_meas_res(struct osmo_phsap_prim *l1sap, uint8_t chan_nr, int16_t toa256, - float ber, float rssi, uint32_t fn) -{ - memset(l1sap, 0, sizeof(*l1sap)); - osmo_prim_init(&l1sap->oph, SAP_GSM_PH, PRIM_MPH_INFO, - PRIM_OP_INDICATION, NULL); - l1sap->u.info.type = PRIM_INFO_MEAS; - l1sap->u.info.u.meas_ind.chan_nr = chan_nr; - l1sap->u.info.u.meas_ind.ta_offs_256bits = toa256; - l1sap->u.info.u.meas_ind.ber10k = (unsigned int) (ber * 10000); - l1sap->u.info.u.meas_ind.inv_rssi = (uint8_t) (rssi * -1); - l1sap->u.info.u.meas_ind.fn = fn; -} - -int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, - int n_errors, int n_bits_total, float rssi, int16_t toa256) -{ - struct gsm_lchan *lchan = &trx->ts[tn].lchan[l1sap_chan2ss(chan_nr)]; - struct osmo_phsap_prim l1sap; - /* 100% BER is n_bits_total is 0 */ - float ber = n_bits_total==0 ? 1.0 : (float)n_errors / (float)n_bits_total; - - LOGPFN(DMEAS, LOGL_DEBUG, fn, "RX UL measurement for %s fn=%u chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS " - "ber=%.2f%% (%d/%d bits) L1_ta=%d rqd_ta=%d toa256=%d\n", - gsm_lchan_name(lchan), fn, chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.current), - rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info[1], lchan->rqd_ta, toa256); - - l1if_fill_meas_res(&l1sap, chan_nr, toa256, ber, rssi, fn); - - return l1sap_up(trx, &l1sap); -} - - /* primitive from common part */ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap) { diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 4ff1f97..7370999 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -115,8 +115,6 @@ int l1if_provision_transceiver_trx(struct trx_l1h *l1h); int l1if_provision_transceiver(struct gsm_bts *bts); int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn); -int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, - int n_errors, int n_bits_total, float rssi, int16_t toa256); static inline struct l1sched_trx *trx_l1sched_hdl(struct gsm_bts_trx *trx) { diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 6671243..ab0472e 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -116,6 +116,7 @@ gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR); gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR); gsm_bts_set_feature(bts, BTS_FEAT_CBCH); + gsm_bts_set_feature(bts, BTS_FEAT_MEAS_PAYLOAD_COMB); bts_model_vty_init(bts); diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 20d502f..5abb73b 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -193,12 +193,10 @@ /* TODO: Should we pass old TOA here? Otherwise we risk * unnecessary decreasing TA */ - /* Send uplink measurement information to L2 */ - l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr | tn, - 456, 456, -110, 0); - /* FIXME: use actual values for BER etc */ + /* Note: RSSI is set to 0 to indicate to the higher + * layers that this is a faked ph_data_ind */ _sched_compose_ph_data_ind(l1t, tn, 0, chan, NULL, 0, - -110, 0, 0, 10000, + 0, 0, 0, 10000, PRES_INFO_INVALID); } } @@ -345,6 +343,9 @@ uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; struct osmo_phsap_prim *l1sap; + int32_t *toa256_sum = &chan_state->toa256_sum; + uint8_t *toa_num = &chan_state->toa_num; + int16_t toa256; /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH @@ -390,8 +391,17 @@ LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "TCH mode invalid, please fix!\n"); len = 0; } - if (len) - _sched_compose_tch_ind(l1t, tn, fn, chan, tch_data, len); + + if (len) { + if (*toa_num == 0) + toa256 = 0; + else + toa256 = *toa256_sum / *toa_num; + + /* Note: RSSI is set to 0 to indicate to the higher + * layers that this is a faked tch_ind */ + _sched_compose_tch_ind(l1t, tn, fn, chan, tch_data, len, toa256, 10000, 0); + } } /* get frame and unlink from queue */ @@ -982,12 +992,6 @@ } else l2_len = GSM_MACBLOCK_LEN; - /* Send uplink measurement information to L2 */ - l1if_process_meas_res(l1t->trx, bi->tn, *first_fn, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, - *rssi_sum / *rssi_num, - *toa256_sum / *toa_num); lqual_cb = *ci_cb_num ? (*ci_cb_sum / *ci_cb_num) : 0; ber10k = compute_ber10k(n_bits_total, n_errors); return _sched_compose_ph_data_ind(l1t, bi->tn, *first_fn, @@ -1097,14 +1101,6 @@ &n_errors, &n_bits_total); } - - /* Send uplink measurement information to L2 */ - l1if_process_meas_res(l1t->trx, bi->tn, *first_fn, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, - *rssi_sum / *rssi_num, - *toa256_sum / *toa_num); - if (rc <= 0) { LOGL1S(DL1P, LOGL_DEBUG, l1t, bi->tn, chan, bi->fn, "Received bad PDTCH (%u/%u)\n", @@ -1141,6 +1137,7 @@ struct gsm_lchan *lchan = get_lchan_by_chan_nr(l1t->trx, trx_chan_desc[chan].chan_nr | bi->tn); unsigned int fn_begin; + uint16_t ber10k; /* handle rach, if handover rach detection is turned on */ if (chan_state->ho_rach_detect == 1) @@ -1240,17 +1237,13 @@ if (rc != GSM_MACBLOCK_LEN && lchan->ecu_state) osmo_ecu_frame_in(lchan->ecu_state, bfi_flag, tch_data, rc); + ber10k = compute_ber10k(n_bits_total, n_errors); if (bfi_flag) goto bfi; /* FACCH */ if (rc == GSM_MACBLOCK_LEN) { - uint16_t ber10k = compute_ber10k(n_bits_total, n_errors); fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_F); - l1if_process_meas_res(l1t->trx, bi->tn, fn_begin, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, - bi->rssi, bi->toa256); _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan, tch_data + amr, GSM_MACBLOCK_LEN, /* FIXME: AVG RSSI and ToA256 */ @@ -1311,12 +1304,8 @@ /* TCH or BFI */ compose_l1sap: fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F); - l1if_process_meas_res(l1t->trx, bi->tn, fn_begin, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, - bi->rssi, bi->toa256); return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, - tch_data, rc); + tch_data, rc, bi->toa256, ber10k, bi->rssi); } /*! \brief a single TCH/H burst was received by the PHY, process it */ @@ -1343,6 +1332,7 @@ */ int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; unsigned int fn_begin; + uint16_t ber10k; /* handle RACH, if handover RACH detection is turned on */ if (chan_state->ho_rach_detect == 1) @@ -1385,6 +1375,8 @@ } *mask = 0x0; + ber10k = compute_ber10k(n_bits_total, n_errors); + /* skip second of two TCH frames of FACCH was received */ if (chan_state->ul_ongoing_facch) { chan_state->ul_ongoing_facch = 0; @@ -1464,10 +1456,6 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H0); else fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H1); - l1if_process_meas_res(l1t->trx, bi->tn, fn_begin, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, bi->rssi, - bi->toa256); _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan, tch_data + amr, GSM_MACBLOCK_LEN, /* FIXME: AVG both RSSI and ToA */ @@ -1533,12 +1521,8 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H0); else fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H1); - l1if_process_meas_res(l1t->trx, bi->tn, fn_begin, - trx_chan_desc[chan].chan_nr | bi->tn, - n_errors, n_bits_total, bi->rssi, - bi->toa256); return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, - tch_data, rc); + tch_data, rc, bi->toa256, ber10k, bi->rssi); } /* schedule all frames of all TRX for given FN */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:35:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 14:35:58 +0000 Subject: Change in osmo-msc[master]: VTY: mark 'subscriber create imsi' command as deprecated References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16954 ) Change subject: VTY: mark 'subscriber create imsi' command as deprecated ...................................................................... VTY: mark 'subscriber create imsi' command as deprecated Neither it should appear in the interactive VTY nor in documentation. Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 --- M doc/manuals/vty/msc_vty_reference.xml M src/libmsc/msc_vty.c 2 files changed, 6 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/16954/1 diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index d5273d4..09ad67d 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -697,14 +697,6 @@ - - - - - - - - @@ -1550,14 +1542,6 @@ - - - - - - - - diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index e8fff0b..7be74d0 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1380,13 +1380,12 @@ return CMD_SUCCESS; } -DEFUN(subscriber_create, - subscriber_create_cmd, - "subscriber create imsi ID", - "Operations on a Subscriber\n" \ - "Create new subscriber\n" \ - "Identify the subscriber by his IMSI\n" \ - "Identifier for the subscriber\n") +DEFUN_DEPRECATED(subscriber_create, subscriber_create_cmd, + "subscriber create imsi ID", + "Operations on a Subscriber\n" + "Create new subscriber\n" + "Identify the subscriber by his IMSI\n" + "Identifier for the subscriber\n") { vty_out(vty, "%% 'subscriber create' now needs to be done at osmo-hlr%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 Gerrit-Change-Number: 16954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:39:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 14:39:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 8: in general: TITAN UDPasp has AFAIK long been deprecated in favor of IPL4asp, which AFAIK we use everywhere else when talking UDP (e.g. GTP-U, RTP, ...). But I guess there's not much point in reimplementing it now, after you're already done. The mDNS_Emulation indeed doesn't seem to be doing a lot. I think it might be best to simply replace it with a CodecPort, like we do it with GTP or RTP, both also basd on UDP. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:39:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:55:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 14:55:23 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Bind VTY to assigned IP addr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16952 ) Change subject: ttcn3-pcu: Bind VTY to assigned IP addr ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 Gerrit-Change-Number: 16952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:55:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:55:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 14:55:27 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Bind VTY to assigned IP addr In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16952 ) Change subject: ttcn3-pcu: Bind VTY to assigned IP addr ...................................................................... ttcn3-pcu: Bind VTY to assigned IP addr Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 --- M ttcn3-pcu-test/osmo-pcu.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg index d7ef445..326ad59 100644 --- a/ttcn3-pcu-test/osmo-pcu.cfg +++ b/ttcn3-pcu-test/osmo-pcu.cfg @@ -14,7 +14,7 @@ line vty no login - bind 0.0.0.0 + bind 172.18.13.101 pcu flow-control-interval 10 cs 2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5240f7ff5d669228077e703b124e6b9de6e7f2b7 Gerrit-Change-Number: 16952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 14:56:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 14:56:15 +0000 Subject: Change in osmo-msc[master]: VTY: mark 'subscriber create imsi' command as deprecated In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16954 ) Change subject: VTY: mark 'subscriber create imsi' command as deprecated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 Gerrit-Change-Number: 16954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:56:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:01:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:01:02 +0000 Subject: Change in libosmo-sccp[master]: example_sccp_demo_user: Use osmocom logging system instead of printf References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example_sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... example_sccp_demo_user: Use osmocom logging system instead of printf Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 --- M examples/internal.h M examples/sccp_demo_user.c M examples/sccp_test_server.c 3 files changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/16955/1 diff --git a/examples/internal.h b/examples/internal.h index 70b9058..ef560ed 100644 --- a/examples/internal.h +++ b/examples/internal.h @@ -5,6 +5,11 @@ #define SSN_TEST_ECHO 202 #define SSN_TEST_CALLBACK 203 +/* Debug Areas of the code */ +enum { + DMAIN +}; + struct osmo_sccp_user; int sccp_test_user_vty_install(struct osmo_sccp_instance *inst, int ssn); diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 8cf3c33..e3f5ee0 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -58,6 +58,12 @@ } static const struct log_info_cat log_info_cat[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "sccp_demo_user specific logging", + .color = "\033[1;31m", + .enabled = 1, .loglevel = LOGL_INFO, + }, }; static const struct log_info log_info = { diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index a66cb21..11bd65a 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -23,15 +23,15 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - printf("%s: refusing N-CONNECT.ind (local_ref=%u)\n", - __func__, scu_prim->u.connect.conn_id); + LOGP(DMAIN, LOGL_INFO, "refusing N-CONNECT.ind (local_ref=%u)\n", + scu_prim->u.connect.conn_id); osmo_sccp_tx_disconn(scu, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, 23); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); @@ -49,27 +49,27 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - printf("%s: Accepting N-CONNECT.ind (local_ref=%u)\n", - __func__, scu_prim->u.connect.conn_id); + LOGP(DMAIN, LOGL_INFO, "Accepting N-CONNECT.ind (local_ref=%u)\n", + scu_prim->u.connect.conn_id); osmo_sccp_tx_conn_resp(scu, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-DATA.ind (local_ref=%u)\n", - __func__, scu_prim->u.data.conn_id); + LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n", + scu_prim->u.data.conn_id); osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-UNITDATA.ind\n", __func__); + LOGP(DMAIN, LOGL_INFO, "Echoing N-UNITDATA.ind\n"); osmo_sccp_tx_unitdata(scu, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, data, data_len); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); @@ -87,21 +87,21 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: N-UNITDATA.ind: Connecting back to sender\n", __func__); + LOGP(DMAIN, LOGL_INFO, "N-UNITDATA.ind: Connecting back to sender\n"); osmo_sccp_tx_conn_req(scu, conn_id++, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-DATA.ind (local_ref=%u)\n", - __func__, scu_prim->u.data.conn_id); + LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n", + scu_prim->u.data.conn_id); osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id, data, data_len); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:01:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:01:02 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: Support reading log/vty config from file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 ) Change subject: examples/sccp_demo_user: Support reading log/vty config from file ...................................................................... examples/sccp_demo_user: Support reading log/vty config from file Passing a config file is still optional, and both client and server work out of the box with providing any. It's still goot allowing to pass a config file to be able to configure easily stuff like logging, VTY ip address binding, etc. Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e --- M examples/sccp_demo_user.c 1 file changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/16956/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index e3f5ee0..88aead3 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -22,6 +24,8 @@ #include "internal.h" +static const char *config_file; + static struct osmo_sccp_instance *g_sccp; static struct osmo_sccp_instance *sua_server_helper(int local_port, const char *local_address, int local_pc, @@ -71,11 +75,10 @@ .num_cat = ARRAY_SIZE(log_info_cat), }; -static void init_logging(void) +static void init_logging(void *tall_ctx) { const int log_cats[] = { DLSS7, DLSUA, DLM3UA, DLSCCP, DLINP }; unsigned int i; - void *tall_ctx = talloc_named_const(NULL, 1, "example"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_print_category(osmo_stderr_target, true); @@ -177,7 +180,7 @@ int remote_pc = DEFAULT_PC_CLIENT; bool lflag = false, rflag = false, Lflag = false, Rflag = false; - while ((ch = getopt(argc, argv, "cl:r:L:R:")) != -1) { + while ((ch = getopt(argc, argv, "cl:r:L:R:C:")) != -1) { switch (ch) { case 'c': client = true; @@ -222,6 +225,9 @@ remote_pc = atoi(optarg); Rflag = true; break; + case 'C': + config_file = optarg; + break; default: usage(); } @@ -237,14 +243,30 @@ signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); - init_logging(); + void *tall_ctx = talloc_named_const(NULL, 1, "sccp_demo_user"); + init_logging(tall_ctx); OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); + vty_info.tall_ctx = tall_ctx; vty_init(&vty_info); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); osmo_ss7_vty_init_asp(NULL); osmo_sccp_vty_init(); - rc = telnet_init_dynif(NULL, NULL, local_address, 2324+client); + /* Read the config if requested with -C */ + if (config_file) { + rc = vty_read_config_file(config_file, NULL); + if (rc < 0) { + LOGP(DMAIN, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + config_file); + exit(1); + } + } + + rc = telnet_init_dynif(NULL, NULL, config_file ? vty_get_bind_addr() : local_address, + 2324+client); if (rc < 0) { perror("Error binding VTY port"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e Gerrit-Change-Number: 16956 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:01:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:01:27 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... example/sccp_demo_user: Use osmocom logging system instead of printf Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 --- M examples/internal.h M examples/sccp_demo_user.c M examples/sccp_test_server.c 3 files changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/16955/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:01:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:01:27 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: Support reading log/vty config from file In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 ) Change subject: examples/sccp_demo_user: Support reading log/vty config from file ...................................................................... examples/sccp_demo_user: Support reading log/vty config from file Passing a config file is still optional, and both client and server work out of the box with providing any. It's still goot allowing to pass a config file to be able to configure easily stuff like logging, VTY ip address binding, etc. Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e --- M examples/sccp_demo_user.c 1 file changed, 27 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/16956/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e Gerrit-Change-Number: 16956 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:20:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:20:03 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 ) Change subject: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 ...................................................................... osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 When using osmo_sccp_simple_client(), it will create an sccp instance if none exists. The sccp instance identifier starts with 0. The implicit created instance should use sccp instance 0 (the first connection). This is basically a counterpart of much older commit 3884eb68d9322967340d4f04e7382b2147ec7a2e, were same logic was applied to osmo_sccp_simple_client(). Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 --- M src/sccp_user.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/57/16957/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index 386f424..d85fc1d 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -691,7 +691,7 @@ enum osmo_ss7_asp_protocol prot, int local_port, const char *local_ip) { - return osmo_sccp_simple_server_on_ss7_id(ctx, 1, pc, prot, + return osmo_sccp_simple_server_on_ss7_id(ctx, 0, pc, prot, local_port, local_ip); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 Gerrit-Change-Number: 16957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:29:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:29:35 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... examples/sccp_test_server: Log primitive name instead of value Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d --- M examples/sccp_test_server.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/16958/1 diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 11bd65a..3aef725 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -30,8 +30,8 @@ 23); break; default: - LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); @@ -68,8 +68,8 @@ data, data_len); break; default: - LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); @@ -100,8 +100,8 @@ data, data_len); break; default: - LOGP(DMAIN, LOGL_INFO, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:39:56 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jan 2020 15:39:56 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 2: There is an extra line in the output: "SPN, hplmn_disp, oplmn_disp: ('', False, False)" I think that is why it fails. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 15:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:41:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 15:41:48 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log disconnect indication in echo service References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 ) Change subject: examples/sccp_test_server: Log disconnect indication in echo service ...................................................................... examples/sccp_test_server: Log disconnect indication in echo service Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d --- M examples/sccp_test_server.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/16959/1 diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 3aef725..aa3a76c 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -67,6 +67,11 @@ &scu_prim->u.unitdata.calling_addr, data, data_len); break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): + LOGP(DMAIN, LOGL_INFO, "Got N-DISCONNECT.ind (local_ref=%u, cause=%u, importance=%u)\n", + scu_prim->u.disconnect.conn_id, scu_prim->u.disconnect.cause, + scu_prim->u.disconnect.importance); + break; default: LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", osmo_scu_prim_name(oph)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d Gerrit-Change-Number: 16959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 15:45:36 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Mon, 20 Jan 2020 15:45:36 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > > again two logically separate changes in one patch. Please split. Sorry for being clueless here. Should I split this commit and re-submit for review? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 15:45:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 16:53:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 16:53:47 +0000 Subject: Change in libosmo-sccp[master]: sccp_scoc: Deliver correct disconnect cause and importance to user on... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 ) Change subject: sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration ...................................................................... sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 --- M src/sccp_scoc.c 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/16960/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index b5b6547..d2fb8d1 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -734,6 +734,7 @@ udisp = &scu_prim->u.disconnect; udisp->conn_id = conn->conn_id; udisp->responding_addr = conn->called_addr; + udisp->importance = conn->importance; udisp->originator = OSMO_SCCP_ORIG_UNDEFINED; //udisp->in_sequence_control; if (xua) { @@ -1080,9 +1081,14 @@ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); break; case SCOC_E_T_IAR_EXP: + xua = xua_msg_alloc(); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, + SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE); + xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance); /* Send N-DISCONNECT.ind to local user */ - scu_gen_encode_and_send(conn, event, NULL, OSMO_SCU_PRIM_N_DISCONNECT, + scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION); + talloc_free(xua); /* Send RLSD to peer */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL); conn_start_rel_timer(conn); @@ -1120,14 +1126,20 @@ if (xua_msg_get_u32(xua, SUA_IEI_SRC_REF) != conn->remote_ref || xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) != conn->sccp_class) { /* Release connection */ - /* send N-DISCONNECT.ind to user */ - scu_gen_encode_and_send(conn, event, NULL, - OSMO_SCU_PRIM_N_DISCONNECT, - PRIM_OP_INDICATION); /* Stop inactivity Timers */ conn_stop_inact_timers(conn); + xua = xua_msg_alloc(); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, + SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA); + xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance); + /* send N-DISCONNECT.ind to user */ + scu_gen_encode_and_send(conn, event, xua, + OSMO_SCU_PRIM_N_DISCONNECT, + PRIM_OP_INDICATION); + talloc_free(xua); /* Send RLSD to SCRC */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, NULL); + talloc_free(xua); /* Start release timer */ conn_start_rel_timer(conn); osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 Gerrit-Change-Number: 16960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 17:13:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 17:13:07 +0000 Subject: Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 ) Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend ...................................................................... sccp: Disarm inactivity timer upon T(iar) active->disconn_pend All other code paths moving to state DISCONN_PEND seem to stop them, and anyway that state doesn't permit event SCOC_E_T_IAS_EXP: DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: Received Event T(iar)_expired (sccp_scoc.c:346) ... DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: state_chg to DISCONN_PEND (sccp_scoc.c:1095) ... DLSCCP DEBUG SCCP-SCOC(0){DISCONN_PEND}: Received Event T(ias)_expired (sccp_scoc.c:339) DLSCCP ERROR SCCP-SCOC(0){DISCONN_PEND}: Event T(ias)_expired not permitted (sccp_scoc.c:339) Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 --- M src/sccp_scoc.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/16961/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index d2fb8d1..015850e 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1081,6 +1081,8 @@ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); break; case SCOC_E_T_IAR_EXP: + /* stop inact timers */ + conn_stop_inact_timers(conn); xua = xua_msg_alloc(); xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE); @@ -1091,6 +1093,7 @@ talloc_free(xua); /* Send RLSD to peer */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL); + /* start release timer */ conn_start_rel_timer(conn); osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 Gerrit-Change-Number: 16961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 17:19:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 17:19:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 ) Change subject: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() ...................................................................... stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() Since commit d0575c2fd816bb6a594cd21012ea1421434f3808, we are using a forked version of titan.ProtocolEmulations.SCCP with a change to allow us to run those function directly from its module, no need to copy them anymore. Change-Id: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 --- M stp/STP_Tests.ttcn 1 file changed, 0 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/16962/1 diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 032a900..990518c 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -42,93 +42,6 @@ const OCT1 c_M3UA_SI_SCCP := '03'O; - -/* copy+pasted from SCCP_Emulation.ttcn, where for some reason it is marked as "runs on SCCP_CT" - * without depending on anything of that component */ - function ConvertASPAddressToEncodedAddress_itu( in SCCP_PAR_Address pl_ASPAddress) - return SCCP_param_CPartyAddressEnc - { - - var SCCP_param_CPartyAddress_itu vl_PDUAddress; //structured fit to encoding - var SCCP_param_CPartyAddressEnc vl_PDUAddressEncoded; - - vl_PDUAddress.addressIndicator.pointCodeIndic:= - pl_ASPAddress.addressIndicator.pointCodeIndic; - - vl_PDUAddress.addressIndicator.ssnIndicator:= - pl_ASPAddress.addressIndicator.ssnIndicator; - - vl_PDUAddress.addressIndicator.globalTitleIndic:= - pl_ASPAddress.addressIndicator.globalTitleIndic; - - vl_PDUAddress.addressIndicator.routingIndicator:= - pl_ASPAddress.addressIndicator.routingIndicator; - - vl_PDUAddress.addressIndicator.reserved:='0'B; - // if (ischosen(pl_ASPAddress.signPointCode) ) not used because it is mandatory field (???) - - //----signPointCode handling - if ( ispresent( pl_ASPAddress.signPointCode )) { - vl_PDUAddress.signPointCode := - '00'B&pl_ASPAddress.signPointCode; - } else { - vl_PDUAddress.signPointCode := omit; - }; - - //----subsystemNumber handling - if ( ispresent( pl_ASPAddress.subsystemNumber ) ){ - vl_PDUAddress.subsystemNumber := pl_ASPAddress.subsystemNumber; - } else { - vl_PDUAddress.subsystemNumber :=omit; - }; - - // --- globalTitle handling-- - if ( ispresent(pl_ASPAddress.globalTitle)) - {//startif1 - - var SCCP_ASPfield_GlobalTitle tmpGT ; - tmpGT := pl_ASPAddress.globalTitle; - - if (ischosen(tmpGT.gti0001)) - { - vl_PDUAddress.globalTitle.gti0001.natureOfAddress:=tmpGT.gti0001.natureOfAddress; - vl_PDUAddress.globalTitle.gti0001.oddeven:=tmpGT.gti0001.oddeven; - vl_PDUAddress.globalTitle.gti0001.globalTitleAddress:=tmpGT.gti0001.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0010)) - { - vl_PDUAddress.globalTitle.gti0010.translationType:=tmpGT.gti0010.translationType; - vl_PDUAddress.globalTitle.gti0010.globalTitleAddress:=tmpGT.gti0010.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0011)) - { - vl_PDUAddress.globalTitle.gti0011.translationType:=tmpGT.gti0011.translationType; - vl_PDUAddress.globalTitle.gti0011.encodingScheme:=tmpGT.gti0011.encodingScheme; - vl_PDUAddress.globalTitle.gti0011.numberingPlan:=tmpGT.gti0011.numberingPlan; - vl_PDUAddress.globalTitle.gti0011.globalTitleAddress:=tmpGT.gti0011.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0100)) - { - vl_PDUAddress.globalTitle.gti0100.translationType:=tmpGT.gti0100.translationType; - vl_PDUAddress.globalTitle.gti0100.encodingScheme:=tmpGT.gti0100.encodingScheme; - vl_PDUAddress.globalTitle.gti0100.numberingPlan:=tmpGT.gti0100.numberingPlan; - vl_PDUAddress.globalTitle.gti0100.natureOfAddress:=tmpGT.gti0100.natureOfAddress; - vl_PDUAddress.globalTitle.gti0100.reserved:='0'B; - vl_PDUAddress.globalTitle.gti0100.globalTitleAddress:=tmpGT.gti0100.globalTitleAddress; - } - } - else - { - vl_PDUAddress.globalTitle := omit; - }; - - vl_PDUAddressEncoded.addr:= enc_PDU_SCCP_Address_itu( vl_PDUAddress); - vl_PDUAddressEncoded.paramLength:= lengthof(vl_PDUAddressEncoded.addr); - - return vl_PDUAddressEncoded; - - } //ConvertASPAddressToEncodedAddress_itu - template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address called, SCCP_PAR_Address calling, template (value) octetstring data, template (value) BIT4 msg_hdl := '0000'B) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 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: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 Gerrit-Change-Number: 16962 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:05:40 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/16955/2/examples/sccp_test_server.c File examples/sccp_test_server.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16955/2/examples/sccp_test_server.c at 33 PS2, Line 33: LOGL_INFO NOTICE / ERROR? https://gerrit.osmocom.org/c/libosmo-sccp/+/16955/2/examples/sccp_test_server.c at 71 PS2, Line 71: LOGL_INFO NOTICE / ERROR? https://gerrit.osmocom.org/c/libosmo-sccp/+/16955/2/examples/sccp_test_server.c at 103 PS2, Line 103: LOGL_INFO NOTICE / ERROR? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 18:05:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:07:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:07:22 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: Support reading log/vty config from file In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 ) Change subject: examples/sccp_demo_user: Support reading log/vty config from file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e Gerrit-Change-Number: 16956 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 18:07:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:07:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:07:51 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 ) Change subject: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 Gerrit-Change-Number: 16957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 18:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:08:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:08:37 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 18:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:09:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:09:13 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log disconnect indication in echo service In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 ) Change subject: examples/sccp_test_server: Log disconnect indication in echo service ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d Gerrit-Change-Number: 16959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jan 2020 18:09:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:09:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 18:09:49 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Patch Set 2: > Sorry for being clueless here. no worries at all. It's just that I "grew up" in Linux kernel development, and there I've learned to value the benefit of having a very clean commit history. After all, you may want to go back and revert a single particular feature at some point, etc. - also, having clean, single-purpose patches makes it much easier for the reviewers to understand what you're doing. > Should I split this commit and re-submit for review? Yes, please. The way how this is normally done is by 'git rebase -i' and related edits. One of the two parts (e.g. "add support for MSISDN programming") will continue to keep the Change-Id of this commmit, while the other logical part ("check for SPN length') will become a new commit with a newly-assigned Change-Id. Once youew new branch / list of commits on top of current master looks fine, you can simply re-push "push gerrit HEAD:refs/for/master" like you did the first time. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 18:09:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:15:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 18:15:14 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 2: Code-Review-1 (1 comment) regarding the V-1 (verification of tests -1): If you change the output of the program, the test results will no longer match. You will need to modify the pysim-testdata/*.ok files to the exact expected new output (can be seen in the log file of the test executor, see https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/207/a1=default,a2=default,a3=default,a4=default,label=simtester/console) Hoewever, given the test executor outputs the following: PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. I think there is something broken. It seems like it needs to be investigated what 9404 means, and the SW treated accordingly. https://gerrit.osmocom.org/c/pysim/+/16940/2/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16940/2/pySim-read.py at 133 PS2, Line 133: one more comment here: Please don't introduce new code that is only python 2.x, like this print without parentheisis. you can try to run your code explicitly with "python3 pySim-read.py" to verify before re-submitting. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Mon, 20 Jan 2020 18:15:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 18:48:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jan 2020 18:48:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add a test case to check T3212 expiration during paging References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 ) Change subject: MSC: add a test case to check T3212 expiration during paging ...................................................................... MSC: add a test case to check T3212 expiration during paging Long story short: some time ago I noticed that OsmoMSC crashes if T3212 expires during the Paging procedure. This is not the case anymore (as the test case shows) and apparently the bug has been fixed, hovewer I believe it makes sense to add this test case. Change-Id: If9147ae8b07d5120d2853b9acda2313910ac48be --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/16963/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index ccfc154..cf91b1e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5896,6 +5896,44 @@ vc_conn.done; } +/* Verify the case when T3212 expires during Paging procedure, just before the receipt + * of Paging Response. This used to provoke a NULL-pointer dereference in old versions + * of OsmoMSC, but apparently the bug has been fixed, and we're safe now. */ +friend function f_tc_lu_and_expire_while_paging(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var charstring imsi := hex2str(pars.imsi); + + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Initiate paging procedure from the VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & imsi & " paging"); + f_expect_paging(); + + /* Emulate T3212 expiration during paging (we don't want to wait, right?) */ + f_vty_transceive(MSCVTY, "subscriber imsi " & imsi & " expire"); + + /* MS sends PAGING RESPONSE, *old* OsmoMSC crashes here... */ + f_establish_fully(EST_TYPE_PAG_RESP); + + /* The recent OsmoMSC keeps subscriber in its VLR unless the Paging is completed. + * In this case we do not send anything and just wait for a Clear Command. */ + f_expect_clear(); +} +testcase TC_lu_and_expire_while_paging() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_expire_while_paging), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -6034,6 +6072,7 @@ } execute( TC_invalid_mgcp_crash() ); execute( TC_mm_id_resp_no_identity() ); + execute( TC_lu_and_expire_while_paging() ); } diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 72bbf03..febae09 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -523,6 +523,14 @@ vc_conn.done; } +testcase TC_iu_lu_and_expire_while_paging() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_lu_and_expire_while_paging), 1055, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + control { execute( TC_iu_lu_imsi_reject() ); execute( TC_iu_lu_imsi_timeout_gsup() ); @@ -582,6 +590,7 @@ execute( TC_iu_multi_lu_and_mt_ussd() ); execute( TC_iu_lu_with_invalid_mcc_mnc() ); + execute( TC_iu_lu_and_expire_while_paging() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 68e2958..2d24d43 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -122,6 +122,7 @@ + Tguard timeout MSC_Tests_Iu.ttcn:MASKED MSC_Tests_Iu control part @@ -219,5 +220,6 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 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: If9147ae8b07d5120d2853b9acda2313910ac48be Gerrit-Change-Number: 16963 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 19:16:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 19:16:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Stop test on rx unexpected sccp msg References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 ) Change subject: sccp: Stop test on rx unexpected sccp msg ...................................................................... sccp: Stop test on rx unexpected sccp msg Change-Id: I3889d7f275d3461fb51209d28c101a5570aca9b3 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/16964/1 diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 0091cb4..3d16706 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -146,9 +146,11 @@ } [] MTP3.receive { setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop } [] T.timeout { setverdict(fail, "Timeout waiting for ", exp); + self.stop } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 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: I3889d7f275d3461fb51209d28c101a5570aca9b3 Gerrit-Change-Number: 16964 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 19:16:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 19:16:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_tiar_timeout References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 ) Change subject: sccp: Introduce test TC_tiar_timeout ...................................................................... sccp: Introduce test TC_tiar_timeout Existing templates are moved to SCPP_Templates.ttcn and new ones required for the test are added there. Related: OS#4343 Change-Id: I7b56fe77ac3b350d722c74b043e6ecabc48dcf31 --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 205 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/16965/1 diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index 7c2ffa6..b3e3392 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -9,6 +9,8 @@ module SCCP_Templates { +import from General_Types all; + import from SCCP_Types all; import from SCCPasp_Types all; import from SCCP_Emulation all; @@ -66,5 +68,134 @@ } } +/* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 + +function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) +return template (value) PDU_SCCP { + var SCCP_param_CPartyAddressEnc calling_enc := ConvertASPAddressToEncodedAddress_itu(calling); + + var template (value) PDU_SCCP ret := { + connrequest := { + messageType := cr, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := 2, + pointer2 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + optionalPart := { + credit := omit, + callingPAddress := { + paramName := con_SCCP_cgPA, + paramLength := calling_enc.paramLength, /* overwritten */ + addr := calling_enc.addr + }, + data := omit, + hopCounter := omit, + importance := omit + }, + eop := { paramName:= con_SCCP_eop } + } + } + return ret; +} + +template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 source_lref, + template (present) OCT3 dest_lref) := { + connconfirm := { + messageType := cc, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := ?, + optionalPart := *, + eop := * + } +} + +template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) octetstring data, + template (value) BIT4 msg_hdl := '0000'B) := { + unitdata := { + messageType := udt, + protClass := {'0000'B, msg_hdl}, + pointer1 := 0, /* overwritten */ + pointer2 := 0, /* overwritten */ + pointer3 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := 0, + data := data + } + } +} + +template PDU_SCCP tr_SCCP_UDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template octetstring data := ?, + template BIT4 msg_hdl := '0000'B) := { + unitdata := { + messageType := udt, + protClass := {'0000'B, msg_hdl}, + pointer1 := ?, + pointer2 := ?, + pointer3 := ?, + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := lengthof(data), + data := data + } + } +} + +template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?) := { + inacttest := { + messageType := it, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + sequencingSegmenting := { + reserved := ?, + p_s := ?, + more := ?, + pr := ? + }, + credit := ? + } +} + +template PDU_SCCP tr_SCCP_RLSD(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?, + template (present) SCCP_param_ReleaseCause relcause := ?) := { + released := { + messageType := rlsd, + destLocRef := dest_lref, + sourceLocRef := source_lref, + releaseCause := relcause, + pointer1 := ?, + optionalPart := *, + eop := * + } +} + +template PDU_SCCP ts_SCCP_RLC(OCT3 source_lref, OCT3 dest_lref) := { + relcomp := { + messageType := rlc, + destLocRef := dest_lref, + sourceLocRef := source_lref + } +} + +template PDU_SCCP tr_SCCP_RLC(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?) := { + relcomp := { + messageType := rlc, + destLocRef := dest_lref, + sourceLocRef := source_lref + } +} + } diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 3d16706..03ef4af 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -38,6 +38,33 @@ port SCCP_CODEC_PT MTP3; var MSC_SCCP_MTP3_parameters g_param; + + /*Configure T(tias) over VTY, seconds */ + var integer g_demo_sccp_timer_ias := 7 * 60; + /*Configure T(tiar) over VTY, seconds */ + var integer g_demo_sccp_timer_iar := 15 * 60; +} + +type record of charstring Commands; +private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) +{ + f_vty_enter_cfg_cs7_inst(pt, 0); + for (var integer i := 0; i < sizeof(cmds); i := i+1) { + f_vty_transceive(pt, cmds[i]); + } + f_vty_transceive(pt, "end"); +} + +function f_init_vty() runs on SCCP_Test_RAW_CT { + if (SCCP_DEMO_USER_VTY.checkstate("Mapped")) { + /* skip initialization if already executed once */ + return; + } + map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); + f_vty_set_prompts(SCCP_DEMO_USER_VTY); + f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + f_cs7_inst_0_cfg(SCCP_DEMO_USER_VTY, {"sccp-timer ias " & int2str(g_demo_sccp_timer_ias), + "sccp-timer iar " & int2str(g_demo_sccp_timer_iar)}); } private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT { @@ -54,9 +81,7 @@ ssn := cfg.own_ssn }; - map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); - f_vty_set_prompts(SCCP_DEMO_USER_VTY); - f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + f_init_vty(); /* Create and connect test components */ vc_M3UA := M3UA_CT.create; @@ -73,51 +98,6 @@ self.stop } -/* connection oriented SCCP */ -const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 - -function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) -return template (value) PDU_SCCP { - var SCCP_param_CPartyAddressEnc calling_enc := ConvertASPAddressToEncodedAddress_itu(calling); - - var template (value) PDU_SCCP ret := { - connrequest := { - messageType := cr, - sourceLocRef := source_lref, - protClass := c_class2, - pointer1 := 2, - pointer2 := 0, /* overwritten */ - calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), - optionalPart := { - credit := omit, - callingPAddress := { - paramName := con_SCCP_cgPA, - paramLength := calling_enc.paramLength, /* overwritten */ - addr := calling_enc.addr - }, - data := omit, - hopCounter := omit, - importance := omit - }, - eop := { paramName:= con_SCCP_eop } - } - } - return ret; -} - -template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 dest_lref, - template (present) OCT3 source_lref) := { - connconfirm := { - messageType := cc, - destLocRef := dest_lref, - sourceLocRef := source_lref, - protClass := c_class2, - pointer1 := ?, - optionalPart := *, - eop := * - } -} - private function f_send_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { var SCCP_MTP3_TRANSFERreq tx := { sio := g_param.sio, @@ -155,21 +135,65 @@ } } +private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) runs on SCCP_Test_RAW_CT { + + f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); + f_exp_sccp(tr_SCCP_CC('000000'O, '000001'O)); +} + +private function f_tx_udt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { + + f_send_sccp(ts_SCCP_UDT(calling, called, data)); + f_exp_sccp(tr_SCCP_UDT(called, calling, data)); +} + /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ testcase TC_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_establish_conn(calling, called); +} + +/* Verify T(iar) triggers and releases the channel */ +testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_demo_sccp_timer_ias := 2; + g_demo_sccp_timer_iar := 5; f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); - f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); - f_exp_sccp(tr_SCCP_CC('000001'O, ?)); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_establish_conn(calling, called); + f_tx_udt_exp(calling, called, data); + + log("Waiting for first IT"); + f_exp_sccp(tr_SCCP_IT(?, ?)); + log("Waiting for second IT"); + f_exp_sccp(tr_SCCP_IT(?, ?)); + + log("Waiting for RLSD"); + f_exp_sccp(tr_SCCP_RLSD(?, ?, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ + f_send_sccp(ts_SCCP_RLC('000001'O, '000000'O)); } control { execute( TC_cr_cc() ); + execute( TC_tiar_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 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: I7b56fe77ac3b350d722c74b043e6ecabc48dcf31 Gerrit-Change-Number: 16965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 19:24:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jan 2020 19:24:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce TC_udt_without_cr_cc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 ) Change subject: sccp: Introduce TC_udt_without_cr_cc ...................................................................... sccp: Introduce TC_udt_without_cr_cc Change-Id: I752af1ae4a34d8d72472e716fe721198f1ba46b1 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16966/1 diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 03ef4af..6acb4c7 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -161,6 +161,22 @@ f_establish_conn(calling, called); } +/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ +testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + f_tx_udt_exp(calling, called, data); +} + /* Verify T(iar) triggers and releases the channel */ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; @@ -193,6 +209,7 @@ control { execute( TC_cr_cc() ); + execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 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: I752af1ae4a34d8d72472e716fe721198f1ba46b1 Gerrit-Change-Number: 16966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:51:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:51:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 ) Change subject: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 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: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 Gerrit-Change-Number: 16962 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:51:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:51:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:51:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Stop test on rx unexpected sccp msg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 ) Change subject: sccp: Stop test on rx unexpected sccp msg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 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: I3889d7f275d3461fb51209d28c101a5570aca9b3 Gerrit-Change-Number: 16964 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:51:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:52:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_tiar_timeout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 ) Change subject: sccp: Introduce test TC_tiar_timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 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: I7b56fe77ac3b350d722c74b043e6ecabc48dcf31 Gerrit-Change-Number: 16965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce TC_udt_without_cr_cc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 ) Change subject: sccp: Introduce TC_udt_without_cr_cc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 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: I752af1ae4a34d8d72472e716fe721198f1ba46b1 Gerrit-Change-Number: 16966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 ) Change subject: stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() ...................................................................... stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu() Since commit d0575c2fd816bb6a594cd21012ea1421434f3808, we are using a forked version of titan.ProtocolEmulations.SCCP with a change to allow us to run those function directly from its module, no need to copy them anymore. Change-Id: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 --- M stp/STP_Tests.ttcn 1 file changed, 0 insertions(+), 87 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 032a900..990518c 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -42,93 +42,6 @@ const OCT1 c_M3UA_SI_SCCP := '03'O; - -/* copy+pasted from SCCP_Emulation.ttcn, where for some reason it is marked as "runs on SCCP_CT" - * without depending on anything of that component */ - function ConvertASPAddressToEncodedAddress_itu( in SCCP_PAR_Address pl_ASPAddress) - return SCCP_param_CPartyAddressEnc - { - - var SCCP_param_CPartyAddress_itu vl_PDUAddress; //structured fit to encoding - var SCCP_param_CPartyAddressEnc vl_PDUAddressEncoded; - - vl_PDUAddress.addressIndicator.pointCodeIndic:= - pl_ASPAddress.addressIndicator.pointCodeIndic; - - vl_PDUAddress.addressIndicator.ssnIndicator:= - pl_ASPAddress.addressIndicator.ssnIndicator; - - vl_PDUAddress.addressIndicator.globalTitleIndic:= - pl_ASPAddress.addressIndicator.globalTitleIndic; - - vl_PDUAddress.addressIndicator.routingIndicator:= - pl_ASPAddress.addressIndicator.routingIndicator; - - vl_PDUAddress.addressIndicator.reserved:='0'B; - // if (ischosen(pl_ASPAddress.signPointCode) ) not used because it is mandatory field (???) - - //----signPointCode handling - if ( ispresent( pl_ASPAddress.signPointCode )) { - vl_PDUAddress.signPointCode := - '00'B&pl_ASPAddress.signPointCode; - } else { - vl_PDUAddress.signPointCode := omit; - }; - - //----subsystemNumber handling - if ( ispresent( pl_ASPAddress.subsystemNumber ) ){ - vl_PDUAddress.subsystemNumber := pl_ASPAddress.subsystemNumber; - } else { - vl_PDUAddress.subsystemNumber :=omit; - }; - - // --- globalTitle handling-- - if ( ispresent(pl_ASPAddress.globalTitle)) - {//startif1 - - var SCCP_ASPfield_GlobalTitle tmpGT ; - tmpGT := pl_ASPAddress.globalTitle; - - if (ischosen(tmpGT.gti0001)) - { - vl_PDUAddress.globalTitle.gti0001.natureOfAddress:=tmpGT.gti0001.natureOfAddress; - vl_PDUAddress.globalTitle.gti0001.oddeven:=tmpGT.gti0001.oddeven; - vl_PDUAddress.globalTitle.gti0001.globalTitleAddress:=tmpGT.gti0001.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0010)) - { - vl_PDUAddress.globalTitle.gti0010.translationType:=tmpGT.gti0010.translationType; - vl_PDUAddress.globalTitle.gti0010.globalTitleAddress:=tmpGT.gti0010.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0011)) - { - vl_PDUAddress.globalTitle.gti0011.translationType:=tmpGT.gti0011.translationType; - vl_PDUAddress.globalTitle.gti0011.encodingScheme:=tmpGT.gti0011.encodingScheme; - vl_PDUAddress.globalTitle.gti0011.numberingPlan:=tmpGT.gti0011.numberingPlan; - vl_PDUAddress.globalTitle.gti0011.globalTitleAddress:=tmpGT.gti0011.globalTitleAddress; - } - else if (ischosen(tmpGT.gti0100)) - { - vl_PDUAddress.globalTitle.gti0100.translationType:=tmpGT.gti0100.translationType; - vl_PDUAddress.globalTitle.gti0100.encodingScheme:=tmpGT.gti0100.encodingScheme; - vl_PDUAddress.globalTitle.gti0100.numberingPlan:=tmpGT.gti0100.numberingPlan; - vl_PDUAddress.globalTitle.gti0100.natureOfAddress:=tmpGT.gti0100.natureOfAddress; - vl_PDUAddress.globalTitle.gti0100.reserved:='0'B; - vl_PDUAddress.globalTitle.gti0100.globalTitleAddress:=tmpGT.gti0100.globalTitleAddress; - } - } - else - { - vl_PDUAddress.globalTitle := omit; - }; - - vl_PDUAddressEncoded.addr:= enc_PDU_SCCP_Address_itu( vl_PDUAddress); - vl_PDUAddressEncoded.paramLength:= lengthof(vl_PDUAddressEncoded.addr); - - return vl_PDUAddressEncoded; - - } //ConvertASPAddressToEncodedAddress_itu - template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address called, SCCP_PAR_Address calling, template (value) octetstring data, template (value) BIT4 msg_hdl := '0000'B) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962 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: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 Gerrit-Change-Number: 16962 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Stop test on rx unexpected sccp msg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 ) Change subject: sccp: Stop test on rx unexpected sccp msg ...................................................................... sccp: Stop test on rx unexpected sccp msg Change-Id: I3889d7f275d3461fb51209d28c101a5570aca9b3 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 0091cb4..3d16706 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -146,9 +146,11 @@ } [] MTP3.receive { setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop } [] T.timeout { setverdict(fail, "Timeout waiting for ", exp); + self.stop } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16964 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: I3889d7f275d3461fb51209d28c101a5570aca9b3 Gerrit-Change-Number: 16964 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_tiar_timeout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 ) Change subject: sccp: Introduce test TC_tiar_timeout ...................................................................... sccp: Introduce test TC_tiar_timeout Existing templates are moved to SCPP_Templates.ttcn and new ones required for the test are added there. Related: OS#4343 Change-Id: I7b56fe77ac3b350d722c74b043e6ecabc48dcf31 --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 205 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index 7c2ffa6..b3e3392 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -9,6 +9,8 @@ module SCCP_Templates { +import from General_Types all; + import from SCCP_Types all; import from SCCPasp_Types all; import from SCCP_Emulation all; @@ -66,5 +68,134 @@ } } +/* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 + +function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) +return template (value) PDU_SCCP { + var SCCP_param_CPartyAddressEnc calling_enc := ConvertASPAddressToEncodedAddress_itu(calling); + + var template (value) PDU_SCCP ret := { + connrequest := { + messageType := cr, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := 2, + pointer2 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + optionalPart := { + credit := omit, + callingPAddress := { + paramName := con_SCCP_cgPA, + paramLength := calling_enc.paramLength, /* overwritten */ + addr := calling_enc.addr + }, + data := omit, + hopCounter := omit, + importance := omit + }, + eop := { paramName:= con_SCCP_eop } + } + } + return ret; +} + +template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 source_lref, + template (present) OCT3 dest_lref) := { + connconfirm := { + messageType := cc, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + pointer1 := ?, + optionalPart := *, + eop := * + } +} + +template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) octetstring data, + template (value) BIT4 msg_hdl := '0000'B) := { + unitdata := { + messageType := udt, + protClass := {'0000'B, msg_hdl}, + pointer1 := 0, /* overwritten */ + pointer2 := 0, /* overwritten */ + pointer3 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := 0, + data := data + } + } +} + +template PDU_SCCP tr_SCCP_UDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template octetstring data := ?, + template BIT4 msg_hdl := '0000'B) := { + unitdata := { + messageType := udt, + protClass := {'0000'B, msg_hdl}, + pointer1 := ?, + pointer2 := ?, + pointer3 := ?, + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := lengthof(data), + data := data + } + } +} + +template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?) := { + inacttest := { + messageType := it, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + sequencingSegmenting := { + reserved := ?, + p_s := ?, + more := ?, + pr := ? + }, + credit := ? + } +} + +template PDU_SCCP tr_SCCP_RLSD(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?, + template (present) SCCP_param_ReleaseCause relcause := ?) := { + released := { + messageType := rlsd, + destLocRef := dest_lref, + sourceLocRef := source_lref, + releaseCause := relcause, + pointer1 := ?, + optionalPart := *, + eop := * + } +} + +template PDU_SCCP ts_SCCP_RLC(OCT3 source_lref, OCT3 dest_lref) := { + relcomp := { + messageType := rlc, + destLocRef := dest_lref, + sourceLocRef := source_lref + } +} + +template PDU_SCCP tr_SCCP_RLC(template (present) OCT3 source_lref := ?, + template (present) OCT3 dest_lref := ?) := { + relcomp := { + messageType := rlc, + destLocRef := dest_lref, + sourceLocRef := source_lref + } +} + } diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 3d16706..03ef4af 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -38,6 +38,33 @@ port SCCP_CODEC_PT MTP3; var MSC_SCCP_MTP3_parameters g_param; + + /*Configure T(tias) over VTY, seconds */ + var integer g_demo_sccp_timer_ias := 7 * 60; + /*Configure T(tiar) over VTY, seconds */ + var integer g_demo_sccp_timer_iar := 15 * 60; +} + +type record of charstring Commands; +private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) +{ + f_vty_enter_cfg_cs7_inst(pt, 0); + for (var integer i := 0; i < sizeof(cmds); i := i+1) { + f_vty_transceive(pt, cmds[i]); + } + f_vty_transceive(pt, "end"); +} + +function f_init_vty() runs on SCCP_Test_RAW_CT { + if (SCCP_DEMO_USER_VTY.checkstate("Mapped")) { + /* skip initialization if already executed once */ + return; + } + map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); + f_vty_set_prompts(SCCP_DEMO_USER_VTY); + f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + f_cs7_inst_0_cfg(SCCP_DEMO_USER_VTY, {"sccp-timer ias " & int2str(g_demo_sccp_timer_ias), + "sccp-timer iar " & int2str(g_demo_sccp_timer_iar)}); } private function f_init_raw(SCCP_Configuration cfg) runs on SCCP_Test_RAW_CT { @@ -54,9 +81,7 @@ ssn := cfg.own_ssn }; - map(self:SCCP_DEMO_USER_VTY, system:SCCP_DEMO_USER_VTY); - f_vty_set_prompts(SCCP_DEMO_USER_VTY); - f_vty_transceive(SCCP_DEMO_USER_VTY, "enable"); + f_init_vty(); /* Create and connect test components */ vc_M3UA := M3UA_CT.create; @@ -73,51 +98,6 @@ self.stop } -/* connection oriented SCCP */ -const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 - -function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) -return template (value) PDU_SCCP { - var SCCP_param_CPartyAddressEnc calling_enc := ConvertASPAddressToEncodedAddress_itu(calling); - - var template (value) PDU_SCCP ret := { - connrequest := { - messageType := cr, - sourceLocRef := source_lref, - protClass := c_class2, - pointer1 := 2, - pointer2 := 0, /* overwritten */ - calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), - optionalPart := { - credit := omit, - callingPAddress := { - paramName := con_SCCP_cgPA, - paramLength := calling_enc.paramLength, /* overwritten */ - addr := calling_enc.addr - }, - data := omit, - hopCounter := omit, - importance := omit - }, - eop := { paramName:= con_SCCP_eop } - } - } - return ret; -} - -template (present) PDU_SCCP tr_SCCP_CC(template (present) OCT3 dest_lref, - template (present) OCT3 source_lref) := { - connconfirm := { - messageType := cc, - destLocRef := dest_lref, - sourceLocRef := source_lref, - protClass := c_class2, - pointer1 := ?, - optionalPart := *, - eop := * - } -} - private function f_send_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { var SCCP_MTP3_TRANSFERreq tx := { sio := g_param.sio, @@ -155,21 +135,65 @@ } } +private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) runs on SCCP_Test_RAW_CT { + + f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); + f_exp_sccp(tr_SCCP_CC('000000'O, '000001'O)); +} + +private function f_tx_udt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { + + f_send_sccp(ts_SCCP_UDT(calling, called, data)); + f_exp_sccp(tr_SCCP_UDT(called, calling, data)); +} + /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ testcase TC_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_establish_conn(calling, called); +} + +/* Verify T(iar) triggers and releases the channel */ +testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_demo_sccp_timer_ias := 2; + g_demo_sccp_timer_iar := 5; f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); - f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); - f_exp_sccp(tr_SCCP_CC('000001'O, ?)); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + f_establish_conn(calling, called); + f_tx_udt_exp(calling, called, data); + + log("Waiting for first IT"); + f_exp_sccp(tr_SCCP_IT(?, ?)); + log("Waiting for second IT"); + f_exp_sccp(tr_SCCP_IT(?, ?)); + + log("Waiting for RLSD"); + f_exp_sccp(tr_SCCP_RLSD(?, ?, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ + f_send_sccp(ts_SCCP_RLC('000001'O, '000000'O)); } control { execute( TC_cr_cc() ); + execute( TC_tiar_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16965 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: I7b56fe77ac3b350d722c74b043e6ecabc48dcf31 Gerrit-Change-Number: 16965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce TC_udt_without_cr_cc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 ) Change subject: sccp: Introduce TC_udt_without_cr_cc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 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: I752af1ae4a34d8d72472e716fe721198f1ba46b1 Gerrit-Change-Number: 16966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:53:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce TC_udt_without_cr_cc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 ) Change subject: sccp: Introduce TC_udt_without_cr_cc ...................................................................... sccp: Introduce TC_udt_without_cr_cc Change-Id: I752af1ae4a34d8d72472e716fe721198f1ba46b1 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 03ef4af..6acb4c7 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -161,6 +161,22 @@ f_establish_conn(calling, called); } +/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ +testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + f_tx_udt_exp(calling, called, data); +} + /* Verify T(iar) triggers and releases the channel */ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; @@ -193,6 +209,7 @@ control { execute( TC_cr_cc() ); + execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16966 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: I752af1ae4a34d8d72472e716fe721198f1ba46b1 Gerrit-Change-Number: 16966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:53:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:53:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add a test case to check T3212 expiration during paging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 ) Change subject: MSC: add a test case to check T3212 expiration during paging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 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: If9147ae8b07d5120d2853b9acda2313910ac48be Gerrit-Change-Number: 16963 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:54:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:54:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: add a test case to check T3212 expiration during paging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 ) Change subject: MSC: add a test case to check T3212 expiration during paging ...................................................................... MSC: add a test case to check T3212 expiration during paging Long story short: some time ago I noticed that OsmoMSC crashes if T3212 expires during the Paging procedure. This is not the case anymore (as the test case shows) and apparently the bug has been fixed, hovewer I believe it makes sense to add this test case. Change-Id: If9147ae8b07d5120d2853b9acda2313910ac48be --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 50 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index ccfc154..cf91b1e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5896,6 +5896,44 @@ vc_conn.done; } +/* Verify the case when T3212 expires during Paging procedure, just before the receipt + * of Paging Response. This used to provoke a NULL-pointer dereference in old versions + * of OsmoMSC, but apparently the bug has been fixed, and we're safe now. */ +friend function f_tc_lu_and_expire_while_paging(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var charstring imsi := hex2str(pars.imsi); + + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Initiate paging procedure from the VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & imsi & " paging"); + f_expect_paging(); + + /* Emulate T3212 expiration during paging (we don't want to wait, right?) */ + f_vty_transceive(MSCVTY, "subscriber imsi " & imsi & " expire"); + + /* MS sends PAGING RESPONSE, *old* OsmoMSC crashes here... */ + f_establish_fully(EST_TYPE_PAG_RESP); + + /* The recent OsmoMSC keeps subscriber in its VLR unless the Paging is completed. + * In this case we do not send anything and just wait for a Clear Command. */ + f_expect_clear(); +} +testcase TC_lu_and_expire_while_paging() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_and_expire_while_paging), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -6034,6 +6072,7 @@ } execute( TC_invalid_mgcp_crash() ); execute( TC_mm_id_resp_no_identity() ); + execute( TC_lu_and_expire_while_paging() ); } diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 72bbf03..febae09 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -523,6 +523,14 @@ vc_conn.done; } +testcase TC_iu_lu_and_expire_while_paging() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + vc_conn := f_start_handler(refers(f_tc_lu_and_expire_while_paging), 1055, + ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + control { execute( TC_iu_lu_imsi_reject() ); execute( TC_iu_lu_imsi_timeout_gsup() ); @@ -582,6 +590,7 @@ execute( TC_iu_multi_lu_and_mt_ussd() ); execute( TC_iu_lu_with_invalid_mcc_mnc() ); + execute( TC_iu_lu_and_expire_while_paging() ); /* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */ diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 68e2958..2d24d43 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -122,6 +122,7 @@ + Tguard timeout MSC_Tests_Iu.ttcn:MASKED MSC_Tests_Iu control part @@ -219,5 +220,6 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16963 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: If9147ae8b07d5120d2853b9acda2313910ac48be Gerrit-Change-Number: 16963 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:54:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:54:29 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... Patch Set 2: Code-Review+1 agreeing with fixeria -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:54:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:54:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:54:44 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: Support reading log/vty config from file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 ) Change subject: examples/sccp_demo_user: Support reading log/vty config from file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e Gerrit-Change-Number: 16956 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:54:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:55:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:55:03 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 ) Change subject: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 Gerrit-Change-Number: 16957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:55:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:55:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:55:18 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:55:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:55:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:55:28 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log disconnect indication in echo service In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 ) Change subject: examples/sccp_test_server: Log disconnect indication in echo service ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d Gerrit-Change-Number: 16959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:55:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:55:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:55:45 +0000 Subject: Change in libosmo-sccp[master]: sccp_scoc: Deliver correct disconnect cause and importance to user on... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 ) Change subject: sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 Gerrit-Change-Number: 16960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:55:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:56:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:56:03 +0000 Subject: Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 ) Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 Gerrit-Change-Number: 16961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jan 2020 20:56:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:56:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:56:14 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 20:56:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:56:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:56:16 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: make source / destination name IEs optional by def... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 ) Change subject: gsup_protocol.hrl: make source / destination name IEs optional by default ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 Gerrit-Change-Number: 16925 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 20:56:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:56:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:56:18 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: make source / destination name IEs optional by def... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 ) Change subject: gsup_protocol.hrl: make source / destination name IEs optional by default ...................................................................... gsup_protocol.hrl: make source / destination name IEs optional by default Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 --- M include/gsup_protocol.hrl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index 3f04ece..e304654 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -167,7 +167,7 @@ -define(MANDATORY_DEFAULT, [imsi, message_type]). --define(OPTIONAL_DEFAULT, [message_class]). +-define(OPTIONAL_DEFAULT, [message_class, source_name, destination_name]). -define (GSUP_MESSAGES(), #{ 16#04 => #{message_type => location_upd_req, mandatory => [], optional => [cn_domain]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I67ff73dfdeba1bfadf8ddfe112d8b4bdba62a699 Gerrit-Change-Number: 16925 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 20 20:56:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jan 2020 20:56:18 +0000 Subject: Change in ...osmo_gsup[master]: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 ) Change subject: gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages ...................................................................... gsup_protocol.hrl: SM-RP-MR IE is mandatory for READY-FOR-SM messages Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 --- M include/gsup_protocol.hrl M test/gsup_encode_decode_test.erl 2 files changed, 12 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index e304654..3c867d6 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -198,9 +198,9 @@ 16#28 => #{message_type => mt_forward_sm_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui], optional => [sm_rp_mms]}, 16#29 => #{message_type => mt_forward_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]}, 16#2a => #{message_type => mt_forward_sm_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]}, - 16#2c => #{message_type => ready_for_sm_req, mandatory => [sm_alert_reason]}, - 16#2d => #{message_type => ready_for_sm_err, mandatory => [sm_rp_cause], optional => [sm_rp_ui]}, - 16#2e => #{message_type => ready_for_sm_res, mandatory => []}, + 16#2c => #{message_type => ready_for_sm_req, mandatory => [sm_rp_mr, sm_alert_reason]}, + 16#2d => #{message_type => ready_for_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]}, + 16#2e => #{message_type => ready_for_sm_res, mandatory => [sm_rp_mr]}, 16#30 => #{message_type => check_imei_req, mandatory => [imei]}, 16#31 => #{message_type => check_imei_err, mandatory => [cause]}, 16#32 => #{message_type => check_imei_res, mandatory => [imei_check_result]}, diff --git a/test/gsup_encode_decode_test.erl b/test/gsup_encode_decode_test.erl index c0d3a21..65863c7 100644 --- a/test/gsup_encode_decode_test.erl +++ b/test/gsup_encode_decode_test.erl @@ -375,9 +375,16 @@ ?assertEqual(Bin, gsup_protocol:encode(Map)). ready_for_sm_req_test() -> - Bin = <<16#2c, ?TEST_IMSI_IE, 16#46, 16#01, 16#02>>, + Bin = <<16#2c, ?TEST_IMSI_IE, + 16#40, 16#01, %% SM-RP-MR + 16#41, + 16#46, 16#01, %% Alert reason + 16#02 + >>, Map = #{imsi => <<"123456789012345">>, - message_type => ready_for_sm_req,sm_alert_reason => 2}, + message_type => ready_for_sm_req, + sm_rp_mr => 65, + sm_alert_reason => 2}, ?assertEqual(Map, gsup_protocol:decode(Bin)), ?assertEqual(Bin, gsup_protocol:encode(Map)). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I09b6b8afb1c0d28d4bf214fb8f01c21c895b8546 Gerrit-Change-Number: 16926 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 06:21:13 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 21 Jan 2020 06:21:13 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16846/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/16846/2//COMMIT_MSG at 9 PS2, Line 9: Fixes: CID#207548 seems to me CID#207548 is not related? or is it? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 21 Jan 2020 06:21:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 07:08:41 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 21 Jan 2020 07:08:41 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16846/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/16846/2//COMMIT_MSG at 9 PS2, Line 9: Fixes: CID#207548 > seems to me CID#207548 is not related? or is it? It is: clicking on "show details" in the coverity UI eventually leads to the while loop that is patched here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 21 Jan 2020 07:08:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:16:08 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 09:16:08 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > > (1 comment) > > regarding the V-1 (verification of tests -1): If you change the output of the program, the test results will no longer match. You will need to modify the pysim-testdata/*.ok files to the exact expected new output (can be seen in the log file of the test executor, see https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/207/a1=default,a2=default,a3=default,a4=default,label=simtester/console) > > Hoewever, given the test executor outputs the following: > PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. > OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. > HPLMNAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. > I think there is something broken. It seems like it needs to be investigated what 9404 means, and the SW treated accordingly. Could you please tell me whether i can include the changes to pysim-testdata/*.ok files with expected output in the same commit or will that be a different commit? And, also the same question for fix of python2.x print to python3 print -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 09:16:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:23:47 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 09:23:47 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16940 to look at the new patch set (#3). Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 09:41:19 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16940 to look at the new patch set (#4). Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:48:17 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 09:48:17 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16940 to look at the new patch set (#5). Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:53:57 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 09:53:57 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16940 to look at the new patch set (#6). Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 09:54:07 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 to look at the new patch set (#3). Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... example/sccp_demo_user: Use osmocom logging system instead of printf Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 --- M examples/internal.h M examples/sccp_demo_user.c M examples/sccp_test_server.c 3 files changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/16955/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 09:54:07 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 to look at the new patch set (#2). Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... examples/sccp_test_server: Log primitive name instead of value Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d --- M examples/sccp_test_server.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/16958/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 09:54:07 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log disconnect indication in echo service In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 to look at the new patch set (#2). Change subject: examples/sccp_test_server: Log disconnect indication in echo service ...................................................................... examples/sccp_test_server: Log disconnect indication in echo service Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d --- M examples/sccp_test_server.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/16959/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d Gerrit-Change-Number: 16959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 09:54:07 +0000 Subject: Change in libosmo-sccp[master]: sccp_scoc: Deliver correct disconnect cause and importance to user on... In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 to look at the new patch set (#2). Change subject: sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration ...................................................................... sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 --- M src/sccp_scoc.c 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/16960/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 Gerrit-Change-Number: 16960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 09:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 09:54:07 +0000 Subject: Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 to look at the new patch set (#2). Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend ...................................................................... sccp: Disarm inactivity timer upon T(iar) active->disconn_pend All other code paths moving to state DISCONN_PEND seem to stop them, and anyway that state doesn't permit event SCOC_E_T_IAS_EXP: DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: Received Event T(iar)_expired (sccp_scoc.c:346) ... DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: state_chg to DISCONN_PEND (sccp_scoc.c:1095) ... DLSCCP DEBUG SCCP-SCOC(0){DISCONN_PEND}: Received Event T(ias)_expired (sccp_scoc.c:339) DLSCCP ERROR SCCP-SCOC(0){DISCONN_PEND}: Event T(ias)_expired not permitted (sccp_scoc.c:339) Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 --- M src/sccp_scoc.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/16961/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 Gerrit-Change-Number: 16961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:01:31 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:01:31 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16940 to look at the new patch set (#7). Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/16940/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:18 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... Patch Set 3: Code-Review+2 Applying +2 after doing requested log level changes. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 10:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:35 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... Patch Set 2: Code-Review+2 Reapplying +2 after review -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 10:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:42 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... Patch Set 2: *after rebase -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 10:02:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:55 +0000 Subject: Change in libosmo-sccp[master]: example/sccp_demo_user: Use osmocom logging system instead of printf In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 ) Change subject: example/sccp_demo_user: Use osmocom logging system instead of printf ...................................................................... example/sccp_demo_user: Use osmocom logging system instead of printf Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 --- M examples/internal.h M examples/sccp_demo_user.c M examples/sccp_test_server.c 3 files changed, 27 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/examples/internal.h b/examples/internal.h index 70b9058..ef560ed 100644 --- a/examples/internal.h +++ b/examples/internal.h @@ -5,6 +5,11 @@ #define SSN_TEST_ECHO 202 #define SSN_TEST_CALLBACK 203 +/* Debug Areas of the code */ +enum { + DMAIN +}; + struct osmo_sccp_user; int sccp_test_user_vty_install(struct osmo_sccp_instance *inst, int ssn); diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 8cf3c33..e3f5ee0 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -58,6 +58,12 @@ } static const struct log_info_cat log_info_cat[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "sccp_demo_user specific logging", + .color = "\033[1;31m", + .enabled = 1, .loglevel = LOGL_INFO, + }, }; static const struct log_info log_info = { diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index a66cb21..83b42fa 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -23,15 +23,15 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - printf("%s: refusing N-CONNECT.ind (local_ref=%u)\n", - __func__, scu_prim->u.connect.conn_id); + LOGP(DMAIN, LOGL_INFO, "refusing N-CONNECT.ind (local_ref=%u)\n", + scu_prim->u.connect.conn_id); osmo_sccp_tx_disconn(scu, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, 23); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); @@ -49,27 +49,27 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - printf("%s: Accepting N-CONNECT.ind (local_ref=%u)\n", - __func__, scu_prim->u.connect.conn_id); + LOGP(DMAIN, LOGL_INFO, "Accepting N-CONNECT.ind (local_ref=%u)\n", + scu_prim->u.connect.conn_id); osmo_sccp_tx_conn_resp(scu, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-DATA.ind (local_ref=%u)\n", - __func__, scu_prim->u.data.conn_id); + LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n", + scu_prim->u.data.conn_id); osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-UNITDATA.ind\n", __func__); + LOGP(DMAIN, LOGL_INFO, "Echoing N-UNITDATA.ind\n"); osmo_sccp_tx_unitdata(scu, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, data, data_len); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); @@ -87,21 +87,21 @@ switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - printf("%s: N-UNITDATA.ind: Connecting back to sender\n", __func__); + LOGP(DMAIN, LOGL_INFO, "N-UNITDATA.ind: Connecting back to sender\n"); osmo_sccp_tx_conn_req(scu, conn_id++, &scu_prim->u.unitdata.called_addr, &scu_prim->u.unitdata.calling_addr, data, data_len); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): - printf("%s: Echoing N-DATA.ind (local_ref=%u)\n", - __func__, scu_prim->u.data.conn_id); + LOGP(DMAIN, LOGL_INFO, "Echoing N-DATA.ind (local_ref=%u)\n", + scu_prim->u.data.conn_id); osmo_sccp_tx_data(scu, scu_prim->u.data.conn_id, data, data_len); break; default: - printf("%s: Unknown primitive %u:%u\n", __func__, - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", + oph->primitive, oph->operation); break; } msgb_free(oph->msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I211eee8abdb332161be7a31e2864f254d1f51c66 Gerrit-Change-Number: 16955 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:56 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_demo_user: Support reading log/vty config from file In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 ) Change subject: examples/sccp_demo_user: Support reading log/vty config from file ...................................................................... examples/sccp_demo_user: Support reading log/vty config from file Passing a config file is still optional, and both client and server work out of the box with providing any. It's still goot allowing to pass a config file to be able to configure easily stuff like logging, VTY ip address binding, etc. Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e --- M examples/sccp_demo_user.c 1 file changed, 27 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index e3f5ee0..88aead3 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -22,6 +24,8 @@ #include "internal.h" +static const char *config_file; + static struct osmo_sccp_instance *g_sccp; static struct osmo_sccp_instance *sua_server_helper(int local_port, const char *local_address, int local_pc, @@ -71,11 +75,10 @@ .num_cat = ARRAY_SIZE(log_info_cat), }; -static void init_logging(void) +static void init_logging(void *tall_ctx) { const int log_cats[] = { DLSS7, DLSUA, DLM3UA, DLSCCP, DLINP }; unsigned int i; - void *tall_ctx = talloc_named_const(NULL, 1, "example"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_print_category(osmo_stderr_target, true); @@ -177,7 +180,7 @@ int remote_pc = DEFAULT_PC_CLIENT; bool lflag = false, rflag = false, Lflag = false, Rflag = false; - while ((ch = getopt(argc, argv, "cl:r:L:R:")) != -1) { + while ((ch = getopt(argc, argv, "cl:r:L:R:C:")) != -1) { switch (ch) { case 'c': client = true; @@ -222,6 +225,9 @@ remote_pc = atoi(optarg); Rflag = true; break; + case 'C': + config_file = optarg; + break; default: usage(); } @@ -237,14 +243,30 @@ signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); - init_logging(); + void *tall_ctx = talloc_named_const(NULL, 1, "sccp_demo_user"); + init_logging(tall_ctx); OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); + vty_info.tall_ctx = tall_ctx; vty_init(&vty_info); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); osmo_ss7_vty_init_asp(NULL); osmo_sccp_vty_init(); - rc = telnet_init_dynif(NULL, NULL, local_address, 2324+client); + /* Read the config if requested with -C */ + if (config_file) { + rc = vty_read_config_file(config_file, NULL); + if (rc < 0) { + LOGP(DMAIN, LOGL_FATAL, "Failed to parse the config file: '%s'\n", + config_file); + exit(1); + } + } + + rc = telnet_init_dynif(NULL, NULL, config_file ? vty_get_bind_addr() : local_address, + 2324+client); if (rc < 0) { perror("Error binding VTY port"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e Gerrit-Change-Number: 16956 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:56 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 ) Change subject: osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 ...................................................................... osmo_sccp_simple_server(): use sccp instance index 0 instead of 1 When using osmo_sccp_simple_client(), it will create an sccp instance if none exists. The sccp instance identifier starts with 0. The implicit created instance should use sccp instance 0 (the first connection). This is basically a counterpart of much older commit 3884eb68d9322967340d4f04e7382b2147ec7a2e, were same logic was applied to osmo_sccp_simple_client(). Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 --- M src/sccp_user.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sccp_user.c b/src/sccp_user.c index 386f424..d85fc1d 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -691,7 +691,7 @@ enum osmo_ss7_asp_protocol prot, int local_port, const char *local_ip) { - return osmo_sccp_simple_server_on_ss7_id(ctx, 1, pc, prot, + return osmo_sccp_simple_server_on_ss7_id(ctx, 0, pc, prot, local_port, local_ip); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I85d2680ac65a552d7b2824ec41cd8fc669782079 Gerrit-Change-Number: 16957 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:57 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log primitive name instead of value In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 ) Change subject: examples/sccp_test_server: Log primitive name instead of value ...................................................................... examples/sccp_test_server: Log primitive name instead of value Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d --- M examples/sccp_test_server.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 83b42fa..3aef725 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -30,8 +30,8 @@ 23); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); @@ -68,8 +68,8 @@ data, data_len); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); @@ -100,8 +100,8 @@ data, data_len); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %u:%u\n", - oph->primitive, oph->operation); + LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", + osmo_scu_prim_name(oph)); break; } msgb_free(oph->msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I956fa5989ca2dea46b2eaaf4e562c7962aa8be9d Gerrit-Change-Number: 16958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:57 +0000 Subject: Change in libosmo-sccp[master]: examples/sccp_test_server: Log disconnect indication in echo service In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 ) Change subject: examples/sccp_test_server: Log disconnect indication in echo service ...................................................................... examples/sccp_test_server: Log disconnect indication in echo service Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d --- M examples/sccp_test_server.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index 3aef725..aa3a76c 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -67,6 +67,11 @@ &scu_prim->u.unitdata.calling_addr, data, data_len); break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): + LOGP(DMAIN, LOGL_INFO, "Got N-DISCONNECT.ind (local_ref=%u, cause=%u, importance=%u)\n", + scu_prim->u.disconnect.conn_id, scu_prim->u.disconnect.cause, + scu_prim->u.disconnect.importance); + break; default: LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", osmo_scu_prim_name(oph)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I221519e75800c8bfbe68e24d04913b0c385c521d Gerrit-Change-Number: 16959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:02:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:02:58 +0000 Subject: Change in libosmo-sccp[master]: sccp_scoc: Deliver correct disconnect cause and importance to user on... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 ) Change subject: sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration ...................................................................... sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 --- M src/sccp_scoc.c 1 file changed, 17 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index b5b6547..d2fb8d1 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -734,6 +734,7 @@ udisp = &scu_prim->u.disconnect; udisp->conn_id = conn->conn_id; udisp->responding_addr = conn->called_addr; + udisp->importance = conn->importance; udisp->originator = OSMO_SCCP_ORIG_UNDEFINED; //udisp->in_sequence_control; if (xua) { @@ -1080,9 +1081,14 @@ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); break; case SCOC_E_T_IAR_EXP: + xua = xua_msg_alloc(); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, + SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE); + xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance); /* Send N-DISCONNECT.ind to local user */ - scu_gen_encode_and_send(conn, event, NULL, OSMO_SCU_PRIM_N_DISCONNECT, + scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION); + talloc_free(xua); /* Send RLSD to peer */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL); conn_start_rel_timer(conn); @@ -1120,14 +1126,20 @@ if (xua_msg_get_u32(xua, SUA_IEI_SRC_REF) != conn->remote_ref || xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) != conn->sccp_class) { /* Release connection */ - /* send N-DISCONNECT.ind to user */ - scu_gen_encode_and_send(conn, event, NULL, - OSMO_SCU_PRIM_N_DISCONNECT, - PRIM_OP_INDICATION); /* Stop inactivity Timers */ conn_stop_inact_timers(conn); + xua = xua_msg_alloc(); + xua_msg_add_u32(xua, SUA_IEI_CAUSE, + SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA); + xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance); + /* send N-DISCONNECT.ind to user */ + scu_gen_encode_and_send(conn, event, xua, + OSMO_SCU_PRIM_N_DISCONNECT, + PRIM_OP_INDICATION); + talloc_free(xua); /* Send RLSD to SCRC */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, NULL); + talloc_free(xua); /* Start release timer */ conn_start_rel_timer(conn); osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 Gerrit-Change-Number: 16960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:25:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:25:29 +0000 Subject: Change in docker-playground[master]: sccp: Enable gsmtap log target and configure stderr logging References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16967 ) Change subject: sccp: Enable gsmtap log target and configure stderr logging ...................................................................... sccp: Enable gsmtap log target and configure stderr logging Depends: libosmo-sccp.git Ie75d004a0e9f24309060f241f22209df1bbe358e Change-Id: Ia36f5a4ac7d4d400c218ca3a394ea0482f1ae2d8 --- M ttcn3-sccp-test/jenkins.sh A ttcn3-sccp-test/sccp_demo_user.cfg 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/16967/1 diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 550dc43..f5c1549 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -13,7 +13,7 @@ cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ mkdir $VOL_BASE_DIR/sccp -#cp osmo-sccp.cfg $VOL_BASE_DIR/sccp/ +cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ network_create 172.18.22.0/24 @@ -23,7 +23,7 @@ -v $VOL_BASE_DIR/sccp:/data \ --name ${BUILD_TAG}-stp -d \ $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 >>/data/sccp_demo_user.log 2>&1" + /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1" echo Starting container with SCCP testsuite diff --git a/ttcn3-sccp-test/sccp_demo_user.cfg b/ttcn3-sccp-test/sccp_demo_user.cfg new file mode 100644 index 0000000..59c0867 --- /dev/null +++ b/ttcn3-sccp-test/sccp_demo_user.cfg @@ -0,0 +1,17 @@ +log gsmtap 172.18.22.203 + logging level set-all debug + logging filter all 1 + +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + +line vty + no login + bind 172.18.22.200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia36f5a4ac7d4d400c218ca3a394ea0482f1ae2d8 Gerrit-Change-Number: 16967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:25:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 10:25:29 +0000 Subject: Change in docker-playground[master]: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16968 ) Change subject: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper ...................................................................... stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper Related: OS#4343 Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 --- M osmo-stp-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/16968/1 diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index e76e5a9..62bcbc7 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -32,7 +32,7 @@ autoreconf -fi && \ ./configure && \ make -j8 install && \ - install examples/sccp_demo_user /usr/local/bin/ && \ + install examples/.libs/sccp_demo_user /usr/local/bin/ && \ ldconfig VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 Gerrit-Change-Number: 16968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:26:57 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:26:57 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#3). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:32:36 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:32:36 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16941 to look at the new patch set (#4). Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Added feature to program SPN into sysmoUSIM-SJS1 SIM cards Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce --- M pySim/cards.py M pysim-testdata/sysmoUSIM-SJS1.ok 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/16941/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:41:34 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#5). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/sysmosim-gr1.ok 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:46:29 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:46:29 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#6). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/sysmosim-gr1.ok 3 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:50:54 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:50:54 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#7). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 4 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:55:02 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:55:02 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#8). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 5 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 8 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 10:59:48 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 10:59:48 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#9). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 6 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/9 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 9 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:03:36 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:03:36 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16943 to look at the new patch set (#10). Change subject: Read USIM Service table from SIM ...................................................................... Read USIM Service table from SIM Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/16943/10 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:10:08 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:10:08 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16944 to look at the new patch set (#3). Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Fixed MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 25 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:15:18 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:15:18 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: Hello dexter, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16944 to look at the new patch set (#4). Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Fixed MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 25 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:27:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 11:27:27 +0000 Subject: Change in libosmocore[master]: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16969 ) Change subject: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ ...................................................................... usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ src/usb/Makefile.am:16: warning: variable 'libosmosim_la_LIBADD' is defined but no program or src/usb/Makefile.am:16: library has 'libosmosim_la' as canonical name (possible typo) src/usb/Makefile.am:15: warning: variable 'libosmosim_la_LDFLAGS' is defined but no program or src/usb/Makefile.am:15: library has 'libosmosim_la' as canonical name (possible typo) Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a --- M src/usb/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/16969/1 diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index bca39bf..2dee434 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -12,8 +12,8 @@ lib_LTLIBRARIES = libosmousb.la libosmousb_la_SOURCES = osmo_libusb.c -libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) -libosmosim_la_LIBADD = \ +libosmousb_la_LDFLAGS = -version-info $(LIBVERSION) +libosmousb_la_LIBADD = \ $(top_builddir)/src/libosmocore.la \ $(TALLOC_LIBS) \ $(LIBUSB_LIBS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a Gerrit-Change-Number: 16969 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 11:31:02 +0000 Subject: Change in libosmocore[master]: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16969 ) Change subject: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a Gerrit-Change-Number: 16969 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 21 Jan 2020 11:31:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:32:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 11:32:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 ) Change subject: WIP ...................................................................... WIP Change-Id: I2b52cc637c20d5644f413030edd9040a6e6bfe2f --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 21 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/16970/1 diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 6acb4c7..cd0708c 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -39,6 +39,8 @@ var MSC_SCCP_MTP3_parameters g_param; + var OCT3 g_own_lref := '000001'O + /*Configure T(tias) over VTY, seconds */ var integer g_demo_sccp_timer_ias := 7 * 60; /*Configure T(tiar) over VTY, seconds */ @@ -109,7 +111,9 @@ MTP3.send(tx); } -private function f_exp_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { +private function f_exp_sccp(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { + var SCCP_MTP3_TRANSFERind rx; var template SCCP_MTP3_TRANSFERind exp := { sio := g_param.sio, @@ -122,7 +126,7 @@ T.start; alt { [] MTP3.receive(exp) -> value rx { - setverdict(pass); + return rx; } [] MTP3.receive { setverdict(fail, "Unexpected MTP/SCCP received"); @@ -133,12 +137,17 @@ self.stop } } + return rx; } -private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) runs on SCCP_Test_RAW_CT { +private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) +runs on SCCP_Test_RAW_CT return OCT3 { + var SCCP_MTP3_TRANSFERind mtp3_rx; - f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); - f_exp_sccp(tr_SCCP_CC('000000'O, '000001'O)); + f_send_sccp(ts_SCCP_CR(g_own_lref, calling, called)); + mtp3_rx := f_exp_sccp(tr_SCCP_CC(?, g_own_lref)); + + return mtp3_rx.data.connconfirm.sourceLocRef; } private function f_tx_udt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { @@ -159,6 +168,7 @@ calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_establish_conn(calling, called); + setverdict(pass); } /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ @@ -175,11 +185,13 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_tx_udt_exp(calling, called, data); + setverdict(pass); } /* Verify T(iar) triggers and releases the channel */ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + var OCT3 remote_lref; var octetstring data := f_rnd_octstring(f_rnd_int(100)); /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side @@ -194,7 +206,7 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); - f_establish_conn(calling, called); + remote_lref := f_establish_conn(calling, called); f_tx_udt_exp(calling, called, data); log("Waiting for first IT"); @@ -203,8 +215,9 @@ f_exp_sccp(tr_SCCP_IT(?, ?)); log("Waiting for RLSD"); - f_exp_sccp(tr_SCCP_RLSD(?, ?, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ - f_send_sccp(ts_SCCP_RLC('000001'O, '000000'O)); + f_exp_sccp(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ + f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref)); + setverdict(pass); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f Gerrit-Change-Number: 16970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:33:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 11:33:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Don't use hardcoded SCCP local references In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 to look at the new patch set (#2). Change subject: sccp: Don't use hardcoded SCCP local references ...................................................................... sccp: Don't use hardcoded SCCP local references as tests are added or order is changed, local references used by the system under test may change, so let's take and use the one notified instead of harcoding values. Change-Id: I2b52cc637c20d5644f413030edd9040a6e6bfe2f --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 21 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/16970/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f Gerrit-Change-Number: 16970 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:34:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 11:34:52 +0000 Subject: Change in libosmocore[master]: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16971 ) Change subject: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator ...................................................................... gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator Found by clang with enabled LTO (Link Time Optimization). Change-Id: Ibda4600b4d23b93cf79ff13bb934dfc396aa7d93 --- M src/gsm/gsm48049.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/16971/1 diff --git a/src/gsm/gsm48049.c b/src/gsm/gsm48049.c index 5e74356..3ab907c 100644 --- a/src/gsm/gsm48049.c +++ b/src/gsm/gsm48049.c @@ -95,7 +95,7 @@ [CBSP_IEI_RR_LOADING_LIST] = { TLV_TYPE_TL16V }, [CBSP_IEI_CAUSE] = { TLV_TYPE_TV }, [CBSP_IEI_DCS] = { TLV_TYPE_TV }, - [CBSP_IEI_RECOVERY_IND] { TLV_TYPE_TV }, + [CBSP_IEI_RECOVERY_IND] = { TLV_TYPE_TV }, [CBSP_IEI_MSG_ID] = { TLV_TYPE_FIXED, 2 }, [CBSP_IEI_EMERG_IND] = { TLV_TYPE_TV }, [CBSP_IEI_WARN_TYPE] = { TLV_TYPE_FIXED, 2 }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibda4600b4d23b93cf79ff13bb934dfc396aa7d93 Gerrit-Change-Number: 16971 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:44:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 11:44:49 +0000 Subject: Change in libosmocore[master]: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16971 ) Change subject: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibda4600b4d23b93cf79ff13bb934dfc396aa7d93 Gerrit-Change-Number: 16971 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 11:44:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:52:18 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:52:18 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16945 to look at the new patch set (#3). Change subject: Fixed update_hplmn_act method ...................................................................... Fixed update_hplmn_act method Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:52:19 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 --- M pySim/cards.py M pysim-testdata/sysmoUSIM-SJS1.ok 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/16972/1 diff --git a/pySim/cards.py b/pySim/cards.py index feb1376..67c488f 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -639,6 +639,12 @@ if sw != '9000': print("Programming OPLMNwAcT failed with code %s"%sw) + # EF.HPLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_hplmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming HPLMNwAcT failed with code %s"%sw) + # EF.AD if p.get('mcc') and p.get('mnc'): sw = self.update_ad(p['mnc']) diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 73125ea..bd6dc6a 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -43,7 +43,7 @@ ffffff0000 # unused HPLMNAcT: - ffffffffff # unused + fff11fffff # MCC: 001 MNC: 001 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffffffff # unused ffffffffff # unused ffffffffff # unused -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 11:52:19 +0000 Subject: Change in pysim[master]: Cosmetic/indentation fix References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16973 ) Change subject: Cosmetic/indentation fix ...................................................................... Cosmetic/indentation fix Change-Id: I45d8cb42755003106f9cf21c5f11bdb1d6c817b7 --- M pySim/cards.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/16973/1 diff --git a/pySim/cards.py b/pySim/cards.py index 67c488f..e8efdcb 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -177,7 +177,7 @@ each possible provider uses a specific record number in each EF. The indexes used are ( where N is the number of providers supported ) : - [2 .. N+1] for the operator name - - [1 .. N] for the programable EFs + - [1 .. N] for the programable EFs * 3f00/7f4d/8f0c : Operator Name -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45d8cb42755003106f9cf21c5f11bdb1d6c817b7 Gerrit-Change-Number: 16973 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:53:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 11:53:02 +0000 Subject: Change in osmo-bts[master]: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16974 ) Change subject: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS ...................................................................... osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS src/osmo-bts-sysmo/Makefile.am:25: warning: bin_PROGRAMS was already defined in condition TRUE, which includes condition ENABLE_SYSMOBTS_CALIB src/osmo-bts-sysmo/Makefile.am:10: ... 'bin_PROGRAMS' previously defined here Change-Id: Ib2334dccefd507eaaa6d33e58d4c1e029d7fd540 --- M src/osmo-bts-sysmo/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/16974/1 diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index 4901ea3..5f588f8 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -22,7 +22,7 @@ l1fwd_proxy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) if ENABLE_SYSMOBTS_CALIB -bin_PROGRAMS = sysmobts-calib +bin_PROGRAMS += sysmobts-calib sysmobts_calib_SOURCES = misc/sysmobts-calib.c misc/sysmobts-layer1.c sysmobts_calib_LDADD = -lrt $(COMMON_LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib2334dccefd507eaaa6d33e58d4c1e029d7fd540 Gerrit-Change-Number: 16974 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 11:58:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 11:58:38 +0000 Subject: Change in osmo-bts[master]: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16974 ) Change subject: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib2334dccefd507eaaa6d33e58d4c1e029d7fd540 Gerrit-Change-Number: 16974 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 21 Jan 2020 11:58:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:06:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 12:06:29 +0000 Subject: Change in ...osmo_gsup[master]: Add optional NUM_VECTORS_REQ IE to send_auth_info_req In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 ) Change subject: Add optional NUM_VECTORS_REQ IE to send_auth_info_req ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b Gerrit-Change-Number: 16936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 12:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:06:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 12:06:32 +0000 Subject: Change in ...osmo_gsup[master]: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 ) Change subject: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c Gerrit-Change-Number: 16937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 12:06:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:06:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 12:06:45 +0000 Subject: Change in ...osmo_gsup[master]: Add optional NUM_VECTORS_REQ IE to send_auth_info_req In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 ) Change subject: Add optional NUM_VECTORS_REQ IE to send_auth_info_req ...................................................................... Add optional NUM_VECTORS_REQ IE to send_auth_info_req Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b --- M include/gsup_protocol.hrl M src/gsup_protocol.erl M test/gsup_encode_decode_test.erl 3 files changed, 21 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index 3c867d6..a1e6cf9 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -107,6 +107,7 @@ sm_alert_reason => integer(), imei => binary(), imei_check_result => integer(), + num_vectors_req => integer(), message_class => integer(), source_name => binary(), destination_name => binary(), @@ -158,6 +159,7 @@ -define(SM_ALERT_REASON, 16#46). -define(IMEI, 16#50). -define(IMEI_CHECK_RESULT, 16#51). +-define(NUM_VECTORS_REQ, 16#52). -define(SOURCE_NAME, 16#60). -define(DESTINATION_NAME, 16#61). -define(AN_APDU, 16#62). @@ -173,7 +175,7 @@ 16#04 => #{message_type => location_upd_req, mandatory => [], optional => [cn_domain]}, 16#05 => #{message_type => location_upd_err, mandatory => [cause]}, 16#06 => #{message_type => location_upd_res, mandatory => [], optional => [msisdn, hlr_number, pdp_info_complete, pdp_info_list, pdp_charging]}, - 16#08 => #{message_type => send_auth_info_req, mandatory => [], optional => [cn_domain, auts, rand, supported_rat_types, current_rat_type]}, + 16#08 => #{message_type => send_auth_info_req, mandatory => [], optional => [cn_domain, auts, rand, supported_rat_types, current_rat_type, num_vectors_req]}, 16#09 => #{message_type => send_auth_info_err, mandatory => [cause]}, 16#0a => #{message_type => send_auth_info_res, mandatory => [], optional => [auth_tuples, auts, rand]}, 16#0b => #{message_type => auth_failure_report, mandatory => [], optional => [cn_domain]}, diff --git a/src/gsup_protocol.erl b/src/gsup_protocol.erl index 30d5574..5dd4bda 100644 --- a/src/gsup_protocol.erl +++ b/src/gsup_protocol.erl @@ -159,6 +159,10 @@ ?CHECK_LEN(imei_check_result, Len, 1, 1), decode_ie(Tail, Map#{imei_check_result => IMEIResult}); +decode_ie(<>, Map) -> + ?CHECK_LEN(num_vectors_req, Len, 1, 1), + decode_ie(Tail, Map#{num_vectors_req => NumVectorsRequest}); + decode_ie(<>, Map) -> decode_ie(Tail, Map#{source_name => SourceName}); @@ -467,6 +471,11 @@ ?CHECK_SIZE(imei_check_result, Len, Value), encode_ie(maps:without([imei_check_result], GSUPMessage), <>); +encode_ie(#{num_vectors_req := Value} = GSUPMessage, Head) -> + Len = 1, + ?CHECK_SIZE(num_vectors_req, Len, Value), + encode_ie(maps:without([num_vectors_req], GSUPMessage), <>); + encode_ie(#{source_name := Value} = GSUPMessage, Head) -> Len = size(Value), encode_ie(maps:without([source_name], GSUPMessage), <>); diff --git a/test/gsup_encode_decode_test.erl b/test/gsup_encode_decode_test.erl index 65863c7..85b40b2 100644 --- a/test/gsup_encode_decode_test.erl +++ b/test/gsup_encode_decode_test.erl @@ -44,6 +44,15 @@ ?assertEqual(Map, gsup_protocol:decode(Bin)), ?assertEqual(Bin, gsup_protocol:encode(Map)). +sai_req_num_test() -> + Bin = <<16#08, ?TEST_IMSI_IE, ?TEST_CLASS_SUBSCR_IE, 16#52, 16#01, 16#02>>, + Map = #{imsi => <<"123456789012345">>, + message_class => 1, + message_type => send_auth_info_req, + num_vectors_req => 2}, + ?assertEqual(Map, gsup_protocol:decode(Bin)), + ?assertEqual(Bin, gsup_protocol:encode(Map)). + sai_req_eps_test() -> Bin = <<16#08, ?TEST_IMSI_IE, ?TEST_CLASS_SUBSCR_IE, ?TEST_SUPP_RAT_TYPES_IE, ?TEST_CURR_RAT_TYPE_LTE_IE>>, Map = #{imsi => <<"123456789012345">>, message_class => 1, message_type => send_auth_info_req, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: Ifb338cb849c0c9b2ce338eaa8ead6ac307188d3b Gerrit-Change-Number: 16936 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:06:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 12:06:45 +0000 Subject: Change in ...osmo_gsup[master]: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 ) Change subject: PDP_INFO_COMPLETE IE is optional for insert_sub_data_req ...................................................................... PDP_INFO_COMPLETE IE is optional for insert_sub_data_req Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c --- M include/gsup_protocol.hrl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl index a1e6cf9..dc49723 100644 --- a/include/gsup_protocol.hrl +++ b/include/gsup_protocol.hrl @@ -182,7 +182,7 @@ 16#0c => #{message_type => purge_ms_req, mandatory => [], optional => [cn_domain, hlr_number]}, 16#0d => #{message_type => purge_ms_err, mandatory => [cause]}, 16#0e => #{message_type => purge_ms_res, mandatory => [freeze_p_tmsi]}, - 16#10 => #{message_type => insert_sub_data_req, mandatory => [pdp_info_complete], optional => [cn_domain, msisdn, hlr_number, pdp_info_list, pdp_charging]}, + 16#10 => #{message_type => insert_sub_data_req, mandatory => [], optional => [cn_domain, msisdn, hlr_number, pdp_info_complete, pdp_info_list, pdp_charging]}, 16#11 => #{message_type => insert_sub_data_err, mandatory => [cause]}, 16#12 => #{message_type => insert_sub_data_res, mandatory => []}, 16#14 => #{message_type => delete_sub_data_req, mandatory => [], optional => [cn_domain, pdp_context_id]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_gsup/+/16937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_gsup Gerrit-Branch: master Gerrit-Change-Id: I37fdfc68ae47fe35ef010711be20995680260c2c Gerrit-Change-Number: 16937 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:12:46 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 12:12:46 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#3). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:18:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 12:18:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Don't use hardcoded SCCP local references In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 to look at the new patch set (#3). Change subject: sccp: Don't use hardcoded SCCP local references ...................................................................... sccp: Don't use hardcoded SCCP local references as tests are added or order is changed, local references used by the system under test may change, so let's take and use the one notified instead of harcoding values. Change-Id: I2b52cc637c20d5644f413030edd9040a6e6bfe2f --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/16970/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f Gerrit-Change-Number: 16970 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:18:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 12:18:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 ) Change subject: WIP ...................................................................... WIP Change-Id: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/16975/1 diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5996846..052b399 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -171,11 +171,18 @@ setverdict(pass); } -/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ +/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo + back, but since no connection is requested, inactivty timers are not armed */ testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + var SCCP_MTP3_TRANSFERind rx; var octetstring data := f_rnd_octstring(f_rnd_int(100)); + /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side + has time to keep alive with a T(ias). Keep recommended ratio of + T(iar) >= T(ias)*2 */ + g_demo_sccp_timer_ias := 2; + g_demo_sccp_timer_iar := 5; f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); @@ -185,6 +192,17 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_tx_udt_exp(calling, called, data); + + /* Make sure no SCCP message is received at all, since no connection is active. */ + timer T := int2float(g_demo_sccp_timer_iar + 1); + T.start; + alt { + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + [] T.timeout {} + } setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:20:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 12:20:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: verify inactivity timers are not started in TC_udt_without_csccp: In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 to look at the new patch set (#2). Change subject: sccp: verify inactivity timers are not started in TC_udt_without_csccp: ...................................................................... sccp: verify inactivity timers are not started in TC_udt_without_csccp: Related: OS#4343 Change-Id: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/16975/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:35:17 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 12:35:17 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Patch Set 2: > Patch Set 2: > > > Sorry for being clueless here. > > no worries at all. It's just that I "grew up" in Linux kernel development, and there I've learned to value the benefit of having a very clean commit history. After all, you may want to go back and revert a single particular feature at some point, etc. - also, having clean, single-purpose patches makes it much easier for the reviewers to understand what you're doing. > > > Should I split this commit and re-submit for review? > > Yes, please. The way how this is normally done is by 'git rebase -i' and related edits. One of the two parts (e.g. "add support for MSISDN programming") will continue to keep the Change-Id of this commmit, while the other logical part ("check for SPN length') will become a new commit with a newly-assigned Change-Id. > > Once youew new branch / list of commits on top of current master looks fine, you can simply re-push "push gerrit HEAD:refs/for/master" like you did the first time. Thanks a lot. Your instructions were of great help. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:35:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:36:29 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 12:36:29 +0000 Subject: Change in pysim[master]: Fixing mistakes of rebase In-Reply-To: References: Message-ID: herlesupreeth has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16953 ) Change subject: Fixing mistakes of rebase ...................................................................... Abandoned Commit is squashed and taken care of -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844 Gerrit-Change-Number: 16953 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:37:59 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 12:37:59 +0000 Subject: Change in pysim[master]: More additions to UST parse In-Reply-To: References: Message-ID: herlesupreeth has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16948 ) Change subject: More additions to UST parse ...................................................................... Abandoned Commit is squashed and merged into one commit for UST parsing -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3896fcbde09fc843c68e597729ee3ba04e5ea3d0 Gerrit-Change-Number: 16948 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:49:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:49:14 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 12:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:50:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:50:33 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py at 616 PS4, Line 616: content = enc_spn(p['name'], True, True) since this is a standard file, I would actually argue that this should be done in the "Card" base class. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:50:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:51:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:51:03 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:51:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:51:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:51:18 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:51:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:52:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:52:03 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:52:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:53:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:53:12 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:53:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:54:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:54:37 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py at 616 PS4, Line 616: content = enc_spn(p['name'], True, True) > since this is a standard file, I would actually argue that this should be done in the "Card" base cl [?] Sorry for that, you're just expaning the existing program() method. We should re-factor this at some point to ensure that the Card:program() method handles all the 3GPP standard files and the model-specific sysmoUSIMSJS1:program() function just handles the prorprietary files. But that's a different future patch, not here. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:54:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:54:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:54:58 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Added feature to read Service Provider Name (SPN) from the SIM card Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 30 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-read.py b/pySim-read.py old mode 100755 new mode 100644 index 4bfa900..662ee54 --- a/pySim-read.py +++ b/pySim-read.py @@ -37,7 +37,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn def parse_options(): @@ -121,6 +121,17 @@ else: print("SMSP: Can't read, response code = %s" % (sw,)) + # EF.SPN + try: + (res, sw) = scc.read_binary(EF['SPN']) + if sw == '9000': + spn_res = dec_spn(res) + print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % (spn_res[0], spn_res[1], spn_res[2],)) + else: + print("SPN: Can't read, response code = %s" % (sw,)) + except Exception as e: + print("SPN: Can't read file -- %s" % (str(e),)) + # EF.PLMNsel try: (res, sw) = scc.read_binary(EF['PLMNsel']) diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 6150469..94df376 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -3,6 +3,9 @@ ICCID: 8988219000000117833 IMSI: 001010000000111 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff +SPN: Fairwaves +Display HPLMN: False +Display OPLMN: False PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: ffffff0000 # unused diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index b0ea8be..8b14a30 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -3,6 +3,9 @@ ICCID: 89445310150011013678 IMSI: 001010000000102 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff +SPN: wavemobile +Display HPLMN: False +Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index d9bff94..8d4583d 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -3,6 +3,9 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +SPN: Magic +Display HPLMN: True +Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index fb191e0..7346134 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -3,6 +3,9 @@ ICCID: 8988211900000000004 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +SPN: +Display HPLMN: False +Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index b6a5391..5ad34e4 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -3,6 +3,9 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +SPN: +Display HPLMN: False +Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index d4c3dd9..b306f4d 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -3,6 +3,9 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +SPN: +Display HPLMN: False +Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:58:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:58:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Don't use hardcoded SCCP local references In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 ) Change subject: sccp: Don't use hardcoded SCCP local references ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f Gerrit-Change-Number: 16970 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 12:58:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 12:58:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 12:58:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Don't use hardcoded SCCP local references In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 ) Change subject: sccp: Don't use hardcoded SCCP local references ...................................................................... sccp: Don't use hardcoded SCCP local references as tests are added or order is changed, local references used by the system under test may change, so let's take and use the one notified instead of harcoding values. Change-Id: I2b52cc637c20d5644f413030edd9040a6e6bfe2f --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 23 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 6acb4c7..5996846 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -39,6 +39,8 @@ var MSC_SCCP_MTP3_parameters g_param; + var OCT3 g_own_lref := '000001'O + /*Configure T(tias) over VTY, seconds */ var integer g_demo_sccp_timer_ias := 7 * 60; /*Configure T(tiar) over VTY, seconds */ @@ -109,7 +111,9 @@ MTP3.send(tx); } -private function f_exp_sccp(template PDU_SCCP sccp) runs on SCCP_Test_RAW_CT { +private function f_exp_sccp(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { + var SCCP_MTP3_TRANSFERind rx; var template SCCP_MTP3_TRANSFERind exp := { sio := g_param.sio, @@ -122,7 +126,7 @@ T.start; alt { [] MTP3.receive(exp) -> value rx { - setverdict(pass); + return rx; } [] MTP3.receive { setverdict(fail, "Unexpected MTP/SCCP received"); @@ -133,12 +137,17 @@ self.stop } } + return rx; } -private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) runs on SCCP_Test_RAW_CT { +private function f_establish_conn(SCCP_PAR_Address calling, SCCP_PAR_Address called) +runs on SCCP_Test_RAW_CT return OCT3 { + var SCCP_MTP3_TRANSFERind mtp3_rx; - f_send_sccp(ts_SCCP_CR('000001'O, calling, called)); - f_exp_sccp(tr_SCCP_CC('000000'O, '000001'O)); + f_send_sccp(ts_SCCP_CR(g_own_lref, calling, called)); + mtp3_rx := f_exp_sccp(tr_SCCP_CC(?, g_own_lref)); + + return mtp3_rx.data.connconfirm.sourceLocRef; } private function f_tx_udt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { @@ -159,6 +168,7 @@ calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_establish_conn(calling, called); + setverdict(pass); } /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ @@ -175,11 +185,13 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_tx_udt_exp(calling, called, data); + setverdict(pass); } /* Verify T(iar) triggers and releases the channel */ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + var OCT3 remote_lref; var octetstring data := f_rnd_octstring(f_rnd_int(100)); /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side @@ -194,17 +206,18 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); - f_establish_conn(calling, called); + remote_lref := f_establish_conn(calling, called); f_tx_udt_exp(calling, called, data); log("Waiting for first IT"); - f_exp_sccp(tr_SCCP_IT(?, ?)); + f_exp_sccp(tr_SCCP_IT(remote_lref, g_own_lref)); log("Waiting for second IT"); - f_exp_sccp(tr_SCCP_IT(?, ?)); + f_exp_sccp(tr_SCCP_IT(remote_lref, g_own_lref)); log("Waiting for RLSD"); - f_exp_sccp(tr_SCCP_RLSD(?, ?, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ - f_send_sccp(ts_SCCP_RLC('000001'O, '000000'O)); + f_exp_sccp(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H))); /* Cause: Expiration of Rx Inactivity Timer */ + f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref)); + setverdict(pass); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16970 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: I2b52cc637c20d5644f413030edd9040a6e6bfe2f Gerrit-Change-Number: 16970 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:00:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 13:00:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_it_avoids_tiar References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 ) Change subject: sccp: Introduce test TC_it_avoids_tiar ...................................................................... sccp: Introduce test TC_it_avoids_tiar Change-Id: I3a970a9b7ed7fb178095760025dd83c570dcff5e --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 95 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/16976/1 diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index b3e3392..b0e6df7 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -166,6 +166,24 @@ } } +template PDU_SCCP ts_SCCP_IT(template (present) OCT3 source_lref, + template (present) OCT3 dest_lref) := { + inacttest := { + messageType := it, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + /* rfc3868 3.3.11: sequencing and credit are ignored with class2 */ + sequencingSegmenting := { + reserved := '0'B, + p_s := '0000000'B, + more := '0'B, + pr := '0000000'B + }, + credit := '00'O + } +} + template PDU_SCCP tr_SCCP_RLSD(template (present) OCT3 source_lref := ?, template (present) OCT3 dest_lref := ?, template (present) SCCP_param_ReleaseCause relcause := ?) := { diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 052b399..61d0833 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -111,10 +111,9 @@ MTP3.send(tx); } -private function f_exp_sccp(template PDU_SCCP sccp) -runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { +private function tr_SCCP_MTP3_TRANSFERind(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return template SCCP_MTP3_TRANSFERind { - var SCCP_MTP3_TRANSFERind rx; var template SCCP_MTP3_TRANSFERind exp := { sio := g_param.sio, opc := g_param.dpc, @@ -122,6 +121,13 @@ sls := g_param.sls, data := sccp }; + return exp; +} + +private function f_exp_sccp(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { + var template SCCP_MTP3_TRANSFERind exp := tr_SCCP_MTP3_TRANSFERind(sccp); + var SCCP_MTP3_TRANSFERind rx; timer T := 10.0; T.start; alt { @@ -238,10 +244,78 @@ setverdict(pass); } +/* Verify T(iar) triggers and releases the channel */ +testcase TC_it_avoids_tiar() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var OCT3 remote_lref; + var boolean it_received := false; + + g_demo_sccp_timer_ias := 1; + g_demo_sccp_timer_iar := 3; + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + remote_lref := f_establish_conn(calling, called); + + timer T_total := 7.0; /* Higher than g_demo_sccp_timer_iar */ + timer T_tias := 1.0; /* Lower than g_demo_sccp_timer_iar */ + T_total.start; + T_tias.start; + alt { + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_IT(remote_lref, g_own_lref))) { + it_received := true; + repeat; + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H)))) { + setverdict(fail, "Unexpected SCCP RLSD received"); + self.stop; + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + [] T_tias.timeout { + f_send_sccp(ts_SCCP_IT(g_own_lref, remote_lref)); + T_tias.start; + repeat; + } + [] T_total.timeout { + /* We kept the connection alive only with IT messages for a while, cool! */ + T_tias.stop; + setverdict(pass); + } + } + + if (not it_received) { + setverdict(fail, "Didn't receive any IT (Tias) from peer"); + } + + /* After we stop sending IT, we should be receiving an RLSD triggered from T(iar) */ + log("Waiting for RLSD"); + alt { + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_IT(remote_lref, g_own_lref))) { + repeat; + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H)))) { + f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref)); + setverdict(pass); + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + } +} + control { execute( TC_cr_cc() ); execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); + execute( TC_it_avoids_tiar() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 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: I3a970a9b7ed7fb178095760025dd83c570dcff5e Gerrit-Change-Number: 16976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:00:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:00:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: verify inactivity timers are not started in TC_udt_without_csccp: In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 ) Change subject: sccp: verify inactivity timers are not started in TC_udt_without_csccp: ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975/2/sccp/SCCP_Tests_RAW.ttcn File sccp/SCCP_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975/2/sccp/SCCP_Tests_RAW.ttcn at 174 PS2, Line 174: Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo : back, but since no connection is requested, inactivty timers are not armed */ the comment doesn't appear to match the code. The code is simply dealing with connectionless unit-data messages, while the comment talks about CR/CC (connection-oriented) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 13:00:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:01:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:01:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_it_avoids_tiar In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 ) Change subject: sccp: Introduce test TC_it_avoids_tiar ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 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: I3a970a9b7ed7fb178095760025dd83c570dcff5e Gerrit-Change-Number: 16976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 13:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:02:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:02:35 +0000 Subject: Change in docker-playground[master]: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16968 ) Change subject: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 Gerrit-Change-Number: 16968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 13:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:02:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:02:36 +0000 Subject: Change in docker-playground[master]: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16968 ) Change subject: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 Gerrit-Change-Number: 16968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 13:02:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:02:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:02:53 +0000 Subject: Change in docker-playground[master]: sccp: Enable gsmtap log target and configure stderr logging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16967 ) Change subject: sccp: Enable gsmtap log target and configure stderr logging ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia36f5a4ac7d4d400c218ca3a394ea0482f1ae2d8 Gerrit-Change-Number: 16967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 13:02:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:02:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:02:57 +0000 Subject: Change in docker-playground[master]: sccp: Enable gsmtap log target and configure stderr logging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16967 ) Change subject: sccp: Enable gsmtap log target and configure stderr logging ...................................................................... sccp: Enable gsmtap log target and configure stderr logging Depends: libosmo-sccp.git Ie75d004a0e9f24309060f241f22209df1bbe358e Change-Id: Ia36f5a4ac7d4d400c218ca3a394ea0482f1ae2d8 --- M ttcn3-sccp-test/jenkins.sh A ttcn3-sccp-test/sccp_demo_user.cfg 2 files changed, 19 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 550dc43..f5c1549 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -13,7 +13,7 @@ cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ mkdir $VOL_BASE_DIR/sccp -#cp osmo-sccp.cfg $VOL_BASE_DIR/sccp/ +cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ network_create 172.18.22.0/24 @@ -23,7 +23,7 @@ -v $VOL_BASE_DIR/sccp:/data \ --name ${BUILD_TAG}-stp -d \ $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 >>/data/sccp_demo_user.log 2>&1" + /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1" echo Starting container with SCCP testsuite diff --git a/ttcn3-sccp-test/sccp_demo_user.cfg b/ttcn3-sccp-test/sccp_demo_user.cfg new file mode 100644 index 0000000..59c0867 --- /dev/null +++ b/ttcn3-sccp-test/sccp_demo_user.cfg @@ -0,0 +1,17 @@ +log gsmtap 172.18.22.203 + logging level set-all debug + logging filter all 1 + +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + +line vty + no login + bind 172.18.22.200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia36f5a4ac7d4d400c218ca3a394ea0482f1ae2d8 Gerrit-Change-Number: 16967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:02:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 13:02:58 +0000 Subject: Change in docker-playground[master]: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16968 ) Change subject: stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper ...................................................................... stp-master/Dockerfile: Install sccp_devmo_user bin instead of libtool wrapper Related: OS#4343 Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 --- M osmo-stp-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index e76e5a9..62bcbc7 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -32,7 +32,7 @@ autoreconf -fi && \ ./configure && \ make -j8 install && \ - install examples/sccp_demo_user /usr/local/bin/ && \ + install examples/.libs/sccp_demo_user /usr/local/bin/ && \ ldconfig VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic727d2ce0d010ad58276c912fd70ab76d4570dc2 Gerrit-Change-Number: 16968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:03:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:03:00 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16946 to look at the new patch set (#3). Change subject: Support for MSISDN programming ...................................................................... Support for MSISDN programming Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 --- M pySim-prog.py M pySim-read.py M pySim/cards.py 3 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:03:01 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:03:01 +0000 Subject: Change in pysim[master]: Added checks for SPN References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: Added checks for SPN ...................................................................... Added checks for SPN Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 --- M pySim-prog.py M pySim/cards.py 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/16977/1 diff --git a/pySim-prog.py b/pySim-prog.py index 709086d..b19c24b 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -276,6 +276,12 @@ # Digitize MCC/MNC (5 or 6 digits) plmn_digits = _mcc_mnc_digits(mcc, mnc) + name = None + if opts.name is not None: + if len(opts.name) > 16: + raise ValueError('Service Provider Name must max 16 characters!'); + name = opts.name + msisdn = None if opts.msisdn is not None: if len(opts.msisdn) > 10*2: @@ -424,7 +430,7 @@ # Return that return { - 'name' : opts.name, + 'name' : name, 'iccid' : iccid, 'mcc' : mcc, 'mnc' : mnc, diff --git a/pySim/cards.py b/pySim/cards.py index 59e4dff..bec33f7 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -613,8 +613,9 @@ data, sw = self._scc.update_binary('00F7', content) # set Service Provider Name - content = enc_spn(p['name'], True, True) - data, sw = self._scc.update_binary('6F46', rpad(content, 32)) + if p.get('name') is not None: + content = enc_spn(p['name'], True, True) + data, sw = self._scc.update_binary('6F46', rpad(content, 32)) # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:11:27 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:11:27 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#4). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:16:00 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:16:00 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#5). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoUSIM-SJS1.ok 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:19:32 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:19:32 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#6). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:21:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 13:21:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ccp: verify inactivity timers are not started in TC_udt_without_cr_cc In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 to look at the new patch set (#3). Change subject: ccp: verify inactivity timers are not started in TC_udt_without_cr_cc ...................................................................... ccp: verify inactivity timers are not started in TC_udt_without_cr_cc Related: OS#4343 Change-Id: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/16975/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:22:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 13:22:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 to look at the new patch set (#4). Change subject: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc ...................................................................... sccp: verify inactivity timers are not started in TC_udt_without_cr_cc Related: OS#4343 Change-Id: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/16975/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:22:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 13:22:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_it_avoids_tiar In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 to look at the new patch set (#3). Change subject: sccp: Introduce test TC_it_avoids_tiar ...................................................................... sccp: Introduce test TC_it_avoids_tiar Related: OS#4343 Change-Id: I3a970a9b7ed7fb178095760025dd83c570dcff5e --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 95 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/16976/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 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: I3a970a9b7ed7fb178095760025dd83c570dcff5e Gerrit-Change-Number: 16976 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:22:47 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:22:47 +0000 Subject: Change in pysim[master]: Added support for MSISDN programming plus check for SPN length In-Reply-To: References: Message-ID: herlesupreeth has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16949 ) Change subject: Added support for MSISDN programming plus check for SPN length ...................................................................... Abandoned Commit has been separated and grouped together -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4399aa10a266fff0432cddfe33937b8b96ca0758 Gerrit-Change-Number: 16949 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 13:31:39 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 13:31:39 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16972 to look at the new patch set (#4). Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 --- M pySim/cards.py M pysim-testdata/sysmoUSIM-SJS1.ok 2 files changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/16972/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:26:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 14:26:24 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 ) Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: Ia39d4961a2690ea4c56276db8f1503a75e97d154 --- M src/xua_asp_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/78/16978/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 64892ad..6bab96b 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -34,7 +34,7 @@ /* The general idea is: * * translate incoming SUA/M3UA msg_class/msg_type to xua_asp_event - * * propagate state transitions to XUA_AS_FSM via _onenter functiosn + * * propagate state transitions to XUA_AS_FSM via _onenter functions * * notify the Layer Management of any relevant changes * * */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia39d4961a2690ea4c56276db8f1503a75e97d154 Gerrit-Change-Number: 16978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:26:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 14:26:25 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm.c: Drop unused defines References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 ) Change subject: xua_asp_fsm.c: Drop unused defines ...................................................................... xua_asp_fsm.c: Drop unused defines Those values (except for XUA_T_ACK_SEC) are not used at all, and anyway they already exist as timers in osmo_sccp_timer_defaults (sccp_scoc.c). Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 --- M src/xua_asp_fsm.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/79/16979/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 6bab96b..c8dcac6 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -40,12 +40,7 @@ */ /* According to RFC3868 Section 8 */ -#define XUA_T_A_SEC 2 -#define XUA_T_R_SEC 2 #define XUA_T_ACK_SEC 2 -#define XUA_T_BEAT_SEC 30 -#define SUA_T_IAS_SEC (7*60) /* SUA only */ -#define SUA_T_IAR_SEC (15*60) /* SUA only */ static const struct value_string xua_asp_event_names[] = { { XUA_ASP_E_M_ASP_UP_REQ, "M-ASP_UP.req" }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 Gerrit-Change-Number: 16979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:37:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 14:37:18 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 ) Change subject: cosmetic: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia39d4961a2690ea4c56276db8f1503a75e97d154 Gerrit-Change-Number: 16978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 21 Jan 2020 14:37:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:39:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 14:39:01 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm.c: Drop unused defines In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 ) Change subject: xua_asp_fsm.c: Drop unused defines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 Gerrit-Change-Number: 16979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 21 Jan 2020 14:39:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:54:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 21 Jan 2020 14:54:45 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#8) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 195 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/14743/8 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:54:46 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 21 Jan 2020 14:54:46 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... ipaccess.c: line_already_initialized: int -> bool Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/16980/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index cd10bd6..a2d3f47 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -62,7 +62,7 @@ #define ka_fsm_for_ts(ipaline,ofd) (ipaline->ka_fsm[ofd->priv_nr-1]) struct ipaccess_line { - int line_already_initialized; + bool line_already_initialized; struct osmo_fsm_inst* ka_fsm[NUM_E1_TS]; }; @@ -960,7 +960,7 @@ if (il->line_already_initialized) return 0; - il->line_already_initialized = 1; + il->line_already_initialized = true; switch(line->ops->cfg.ipa.role) { case E1INP_LINE_R_BSC: { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:57:15 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 21 Jan 2020 14:57:15 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 8: Code-Review-2 (10 comments) After assigning #4070 to myself, Harald pointed me at this WIP patch. I've fixed up the cosmetics and added a no-VTY command as suggested in fixeria's review. Set to -2, because it's segfaulting for me when testing with real hardware. I'll look into it more tomorrow. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/e1_input_vty.c File src/e1_input_vty.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/e1_input_vty.c at 175 PS7, Line 175: Enable > If there is a way to enable this feature, shouldn't there be a way to disable it? Line below says "0 disables keepalive". But this is not consistent with "e1_line <0-255> keepalive <1-300> ..." (zero is not allowed!), which has "no e1_line <0-255> keepalive". (Also there is no !interval code below that actually disables it). I've changed it to match "e1_line <1-255> keepalive". https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/e1_input_vty.c at 193 PS7, Line 193: if (!line->driver->has_keepalive) { This check is redundant, due to the check above only the "ipa" driver is allowed. It would not make sense to disable has_keepalive for ipa. Removed. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/e1_input_vty.c at 195 PS7, Line 195: line->driver->name, VTY_NEWLINE); > Cosmetic: alignment. Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/e1_input_vty.c at 282 PS7, Line 282: line->ipa_kap->interval, line->ipa_kap->wait_for_resp, > Cosmetic: alignment. Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 65 PS7, Line 65: int > bool? Changing to bool makes sense to me. However, this patch only moves the struct around, changing from int -> bool is a separate change. So I've added a follow-up patch. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 65 PS7, Line 65: > Please use tabs. Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 103 PS7, Line 103: { > coding style Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 105 PS7, Line 105: send > Cosmetic (not a merge blocker): send() without flags equals to write(). Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 109 PS7, Line 109: { > coding style Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/7/src/input/ipaccess.c at 120 PS7, Line 120: ka_fsm_for_ts(il, bfd) = NULL; It segfaults here when testing with hardware, I'm looking into it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 14:57:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 14:57:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 14:57:32 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 14:57:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 15:17:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jan 2020 15:17:06 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 8: (5 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c File src/e1_input_vty.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 189 PS8, Line 189: line->ipa_kap = talloc_zero(line, struct ipa_keepalive_params); if you run "e1_line" on VTY twice -> memleak. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 192 PS8, Line 192: } else missing {}, but better simply call talloc_free before checking if (interval) to avoif the memleak. btw, what's this macro instead of talloc_free()? https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c at 62 PS8, Line 62: #define ka_fsm_for_ts(ipaline,ofd) (ipaline->ka_fsm[ofd->priv_nr-1]) 1- Missing () when using the params 2- Can we rename this? it's confusing IMHO. #define ipaccess_line_get_ts_ka_fsm(ipaline, ofd) ((ipaline)->ka_fsm[(ofd)->priv_nr - 1]) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c at 65 PS8, Line 65: int line_already_initialized; You are changing this to bool on next commit, better fix it here. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c at 66 PS8, Line 66: struct osmo_fsm_inst* ka_fsm[NUM_E1_TS]; I have the feeling this should not be here but in struct e1i_ts. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 15:17:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 15:33:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 15:33:24 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c File src/e1_input_vty.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 199 PS8, Line 199: ipakeepalive How about 'ipa-keepalive'? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 15:33:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 15:36:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 15:36:31 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c File src/e1_input_vty.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 192 PS8, Line 192: } else > btw, what's this macro instead of talloc_free()? I've got the same question and found the answer in talloc's source code: #define TALLOC_FREE(ctx) do { \ talloc_free(ctx); \ ctx = NULL; \ } while (0) Quite useful macro, I like it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 15:36:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 15:43:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 15:43:54 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 15:43:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 16:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 21 Jan 2020 16:21:10 +0000 Subject: Change in pysim[master]: Added feature to read Service Provider Name (SPN) from the SIM card In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16940 ) Change subject: Added feature to read Service Provider Name (SPN) from the SIM card ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16940/7/pysim-testdata/sysmoISIM-SJA2.ok File pysim-testdata/sysmoISIM-SJA2.ok: https://gerrit.osmocom.org/c/pysim/+/16940/7/pysim-testdata/sysmoISIM-SJA2.ok at 6 PS7, Line 6: SPN: Maybe print something like "(not set)" if the SPN is not set. I always find it a bit confusing when there is just an empty field. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8dc599a76c260ec2823ba5c9b22375b04a50daa8 Gerrit-Change-Number: 16940 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 16:21:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 18:16:20 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 21 Jan 2020 18:16:20 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... Patch Set 9: (2 comments) > Patch Set 9: > > This seems to be the fix for OS#3727 (crash when moving from 3g to 2g or vice versa. I rebased it to get rid of the merge conflict, but I don't know what else this patch is missing. To me it looks like it does what it's supposed to. Should it still be WIP? I moved it to WIP because I didn't had yet the time working on it and to prevent notifications on it. Thanks for rebasing it! The TTCN testcase should succeed if it's done. The testcases are outcomment to not run while jenkins. (SGSN_Iu) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c at 1105 PS2, Line 1105: if (ctx->ran_type == new_ran) > I'd prefer getting rid of this check here and doing it in the caller instead, I think it's easier to [?] i think it's better this way. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_gb_fsm.c File src/sgsn/gprs_mm_state_gb_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_gb_fsm.c at 49 PS2, Line 49: case E_MM_RAN_CHANGE: > Are you sure this cannot happen in MM_STANDBY? Just a guess: I have the feeling you want to have it [?] right. it should also happen MM_STANDBY -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 18:16:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 18:17:56 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 21 Jan 2020 18:17:56 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... Patch Set 9: The comment from pespin might be resolved -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 18:17:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 18:50:44 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Tue, 21 Jan 2020 18:50:44 +0000 Subject: Change in pysim[master]: Provided meaningful message when SPN is not set References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: Provided meaningful message when SPN is not set ...................................................................... Provided meaningful message when SPN is not set Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmosim-gr1.ok 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/16981/1 diff --git a/pySim-read.py b/pySim-read.py index d9ff673..34ff576 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -152,7 +152,10 @@ (res, sw) = scc.read_binary(EF['SPN']) if sw == '9000': spn_res = dec_spn(res) - print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % (spn_res[0], spn_res[1], spn_res[2],)) + if spn_res[0] != '': + print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % (spn_res[0], spn_res[1], spn_res[2],)) + else: + print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % ("Not available", spn_res[1], spn_res[2],)) else: print("SPN: Can't read, response code = %s" % (sw,)) except Exception as e: diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index fbca247..14a1b9c 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -10,7 +10,7 @@ Service 34 - Enabled Services Table: True Service 35 - APN Control List (ACL): False SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: +SPN: Not available Display HPLMN: False Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index 28a9237..b26433b 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -7,7 +7,7 @@ Service 34 - Enabled Services Table: False Service 35 - APN Control List (ACL): False SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: +SPN: Not available Display HPLMN: False Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:34:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:34:42 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm.c: Drop unused defines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 ) Change subject: xua_asp_fsm.c: Drop unused defines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 Gerrit-Change-Number: 16979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:34:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:35:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:35:01 +0000 Subject: Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 ) Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 Gerrit-Change-Number: 16961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:35:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:35:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:35:04 +0000 Subject: Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 ) Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend ...................................................................... sccp: Disarm inactivity timer upon T(iar) active->disconn_pend All other code paths moving to state DISCONN_PEND seem to stop them, and anyway that state doesn't permit event SCOC_E_T_IAS_EXP: DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: Received Event T(iar)_expired (sccp_scoc.c:346) ... DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: state_chg to DISCONN_PEND (sccp_scoc.c:1095) ... DLSCCP DEBUG SCCP-SCOC(0){DISCONN_PEND}: Received Event T(ias)_expired (sccp_scoc.c:339) DLSCCP ERROR SCCP-SCOC(0){DISCONN_PEND}: Event T(ias)_expired not permitted (sccp_scoc.c:339) Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 --- M src/sccp_scoc.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index d2fb8d1..015850e 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1081,6 +1081,8 @@ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); break; case SCOC_E_T_IAR_EXP: + /* stop inact timers */ + conn_stop_inact_timers(conn); xua = xua_msg_alloc(); xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE); @@ -1091,6 +1093,7 @@ talloc_free(xua); /* Send RLSD to peer */ xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL); + /* start release timer */ conn_start_rel_timer(conn); osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74 Gerrit-Change-Number: 16961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:35:05 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 ) Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: Ia39d4961a2690ea4c56276db8f1503a75e97d154 --- M src/xua_asp_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 64892ad..6bab96b 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -34,7 +34,7 @@ /* The general idea is: * * translate incoming SUA/M3UA msg_class/msg_type to xua_asp_event - * * propagate state transitions to XUA_AS_FSM via _onenter functiosn + * * propagate state transitions to XUA_AS_FSM via _onenter functions * * notify the Layer Management of any relevant changes * * */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia39d4961a2690ea4c56276db8f1503a75e97d154 Gerrit-Change-Number: 16978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:35:05 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm.c: Drop unused defines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 ) Change subject: xua_asp_fsm.c: Drop unused defines ...................................................................... xua_asp_fsm.c: Drop unused defines Those values (except for XUA_T_ACK_SEC) are not used at all, and anyway they already exist as timers in osmo_sccp_timer_defaults (sccp_scoc.c). Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 --- M src/xua_asp_fsm.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 6bab96b..c8dcac6 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -40,12 +40,7 @@ */ /* According to RFC3868 Section 8 */ -#define XUA_T_A_SEC 2 -#define XUA_T_R_SEC 2 #define XUA_T_ACK_SEC 2 -#define XUA_T_BEAT_SEC 30 -#define SUA_T_IAS_SEC (7*60) /* SUA only */ -#define SUA_T_IAR_SEC (15*60) /* SUA only */ static const struct value_string xua_asp_event_names[] = { { XUA_ASP_E_M_ASP_UP_REQ, "M-ASP_UP.req" }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id5902e809e02b2651e381cd58ef97b77c1143dc2 Gerrit-Change-Number: 16979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:36:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:36:54 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h File include/osmocom/sgsn/gprs_mm_state_iu_fsm.h: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h at 23 PS1, Line 23: E_PMM_RAN_CHANGE > cosmetics: it's a RAT change (Radio Access Technology), at least that's what it's called in the spec [?] still not adressed in current patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 20:36:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:38:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:38:24 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 20:38:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:39:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:39:47 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-read.py at 212 PS4, Line 212: #print res we can remove those commented-out [python2 only,btw] print statements from the patch. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:39:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:40:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:40:31 +0000 Subject: Change in pysim[master]: Added checks for SPN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: Added checks for SPN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:40:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:41:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:41:12 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py at 81 PS5, Line 81: data = self._scc.read_binary(EF['HPLMNwAcT'], length=None, offset=0) let's remove the old, commented out code. If people want to see how it was done before this patch, they can look at the git history. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:41:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:42:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:42:08 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:42:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:42:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:42:49 +0000 Subject: Change in pysim[master]: Cosmetic/indentation fix In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16973 ) Change subject: Cosmetic/indentation fix ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45d8cb42755003106f9cf21c5f11bdb1d6c817b7 Gerrit-Change-Number: 16973 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:42:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:43:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:43:10 +0000 Subject: Change in pysim[master]: Provided meaningful message when SPN is not set In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: Provided meaningful message when SPN is not set ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:43:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:44:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:44:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 ) Change subject: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_it_avoids_tiar In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 ) Change subject: sccp: Introduce test TC_it_avoids_tiar ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 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: I3a970a9b7ed7fb178095760025dd83c570dcff5e Gerrit-Change-Number: 16976 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 20:45:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 ) Change subject: sccp: verify inactivity timers are not started in TC_udt_without_cr_cc ...................................................................... sccp: verify inactivity timers are not started in TC_udt_without_cr_cc Related: OS#4343 Change-Id: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 --- M sccp/SCCP_Tests_RAW.ttcn 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5996846..9be9c5c 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -171,11 +171,17 @@ setverdict(pass); } -/* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */ +/* Verify sccp_demo_user inactivty timers are not armed upon dealing with +/* connectionless data-unit messages. Since no connection exists. */ testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; + var SCCP_MTP3_TRANSFERind rx; var octetstring data := f_rnd_octstring(f_rnd_int(100)); + /* Keep recommended ratio of T(iar) >= T(ias)*2, but anyway no IT + should be received in this case. */ + g_demo_sccp_timer_ias := 1; + g_demo_sccp_timer_iar := 3; f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); @@ -185,6 +191,17 @@ mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); f_tx_udt_exp(calling, called, data); + + /* Make sure no SCCP message is received at all, since no connection is active. */ + timer T := int2float(g_demo_sccp_timer_iar + 1); + T.start; + alt { + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + [] T.timeout {} + } setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16975 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: I2cc5e41e33aac300d33887caed1cc3fbdffcbb17 Gerrit-Change-Number: 16975 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_it_avoids_tiar In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 ) Change subject: sccp: Introduce test TC_it_avoids_tiar ...................................................................... sccp: Introduce test TC_it_avoids_tiar Related: OS#4343 Change-Id: I3a970a9b7ed7fb178095760025dd83c570dcff5e --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 95 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index b3e3392..b0e6df7 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -166,6 +166,24 @@ } } +template PDU_SCCP ts_SCCP_IT(template (present) OCT3 source_lref, + template (present) OCT3 dest_lref) := { + inacttest := { + messageType := it, + destLocRef := dest_lref, + sourceLocRef := source_lref, + protClass := c_class2, + /* rfc3868 3.3.11: sequencing and credit are ignored with class2 */ + sequencingSegmenting := { + reserved := '0'B, + p_s := '0000000'B, + more := '0'B, + pr := '0000000'B + }, + credit := '00'O + } +} + template PDU_SCCP tr_SCCP_RLSD(template (present) OCT3 source_lref := ?, template (present) OCT3 dest_lref := ?, template (present) SCCP_param_ReleaseCause relcause := ?) := { diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 9be9c5c..7d44eb4 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -111,10 +111,9 @@ MTP3.send(tx); } -private function f_exp_sccp(template PDU_SCCP sccp) -runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { +private function tr_SCCP_MTP3_TRANSFERind(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return template SCCP_MTP3_TRANSFERind { - var SCCP_MTP3_TRANSFERind rx; var template SCCP_MTP3_TRANSFERind exp := { sio := g_param.sio, opc := g_param.dpc, @@ -122,6 +121,13 @@ sls := g_param.sls, data := sccp }; + return exp; +} + +private function f_exp_sccp(template PDU_SCCP sccp) +runs on SCCP_Test_RAW_CT return SCCP_MTP3_TRANSFERind { + var template SCCP_MTP3_TRANSFERind exp := tr_SCCP_MTP3_TRANSFERind(sccp); + var SCCP_MTP3_TRANSFERind rx; timer T := 10.0; T.start; alt { @@ -237,10 +243,78 @@ setverdict(pass); } +/* Verify T(iar) triggers and releases the channel */ +testcase TC_it_avoids_tiar() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var OCT3 remote_lref; + var boolean it_received := false; + + g_demo_sccp_timer_ias := 1; + g_demo_sccp_timer_iar := 3; + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + remote_lref := f_establish_conn(calling, called); + + timer T_total := 7.0; /* Higher than g_demo_sccp_timer_iar */ + timer T_tias := 1.0; /* Lower than g_demo_sccp_timer_iar */ + T_total.start; + T_tias.start; + alt { + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_IT(remote_lref, g_own_lref))) { + it_received := true; + repeat; + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H)))) { + setverdict(fail, "Unexpected SCCP RLSD received"); + self.stop; + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + [] T_tias.timeout { + f_send_sccp(ts_SCCP_IT(g_own_lref, remote_lref)); + T_tias.start; + repeat; + } + [] T_total.timeout { + /* We kept the connection alive only with IT messages for a while, cool! */ + T_tias.stop; + setverdict(pass); + } + } + + if (not it_received) { + setverdict(fail, "Didn't receive any IT (Tias) from peer"); + } + + /* After we stop sending IT, we should be receiving an RLSD triggered from T(iar) */ + log("Waiting for RLSD"); + alt { + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_IT(remote_lref, g_own_lref))) { + repeat; + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_RLSD(remote_lref, g_own_lref, hex2int('0D'H)))) { + f_send_sccp(ts_SCCP_RLC(g_own_lref, remote_lref)); + setverdict(pass); + } + [] MTP3.receive { + setverdict(fail, "Unexpected MTP/SCCP received"); + self.stop; + } + } +} + control { execute( TC_cr_cc() ); execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); + execute( TC_it_avoids_tiar() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16976 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: I3a970a9b7ed7fb178095760025dd83c570dcff5e Gerrit-Change-Number: 16976 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:28 +0000 Subject: Change in libosmocore[master]: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16969 ) Change subject: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a Gerrit-Change-Number: 16969 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 20:45:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:48 +0000 Subject: Change in libosmocore[master]: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16969 ) Change subject: usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ ...................................................................... usb/Makefile.am: fix copy-pasted library name: s/libosmosim/libosmousb/ src/usb/Makefile.am:16: warning: variable 'libosmosim_la_LIBADD' is defined but no program or src/usb/Makefile.am:16: library has 'libosmosim_la' as canonical name (possible typo) src/usb/Makefile.am:15: warning: variable 'libosmosim_la_LDFLAGS' is defined but no program or src/usb/Makefile.am:15: library has 'libosmosim_la' as canonical name (possible typo) Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a --- M src/usb/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am index bca39bf..2dee434 100644 --- a/src/usb/Makefile.am +++ b/src/usb/Makefile.am @@ -12,8 +12,8 @@ lib_LTLIBRARIES = libosmousb.la libosmousb_la_SOURCES = osmo_libusb.c -libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) -libosmosim_la_LIBADD = \ +libosmousb_la_LDFLAGS = -version-info $(LIBVERSION) +libosmousb_la_LIBADD = \ $(top_builddir)/src/libosmocore.la \ $(TALLOC_LIBS) \ $(LIBUSB_LIBS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I062ea640a75f4521818ba71d5ffea2d08bf3052a Gerrit-Change-Number: 16969 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:45:48 +0000 Subject: Change in libosmocore[master]: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16971 ) Change subject: gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator ...................................................................... gsm/gsm48049.c: fix use of GNU 'missing =' extension in designator Found by clang with enabled LTO (Link Time Optimization). Change-Id: Ibda4600b4d23b93cf79ff13bb934dfc396aa7d93 --- M src/gsm/gsm48049.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gsm/gsm48049.c b/src/gsm/gsm48049.c index 5e74356..3ab907c 100644 --- a/src/gsm/gsm48049.c +++ b/src/gsm/gsm48049.c @@ -95,7 +95,7 @@ [CBSP_IEI_RR_LOADING_LIST] = { TLV_TYPE_TL16V }, [CBSP_IEI_CAUSE] = { TLV_TYPE_TV }, [CBSP_IEI_DCS] = { TLV_TYPE_TV }, - [CBSP_IEI_RECOVERY_IND] { TLV_TYPE_TV }, + [CBSP_IEI_RECOVERY_IND] = { TLV_TYPE_TV }, [CBSP_IEI_MSG_ID] = { TLV_TYPE_FIXED, 2 }, [CBSP_IEI_EMERG_IND] = { TLV_TYPE_TV }, [CBSP_IEI_WARN_TYPE] = { TLV_TYPE_FIXED, 2 }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibda4600b4d23b93cf79ff13bb934dfc396aa7d93 Gerrit-Change-Number: 16971 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 20:46:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jan 2020 20:46:14 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr-test: set mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16915 ) Change subject: ttcn3-hlr-test: set mp_hlr_supports_dgsm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iafdf267c6012264966857e41e855fa971f773023 Gerrit-Change-Number: 16915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 20:46:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 21:33:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 21:33:34 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 21:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 22:00:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 22:00:26 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16943/10/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16943/10/pySim-read.py at 123 PS10, Line 123: byte12 = int(swapped[(12*2) - 2:(12*2)], 16) It would be cool to have a value-string dictionary for all possible service names, and a function that would give you a list of enabled services. For example: # This would give us a list of supported services sst = foo.parse_sst(res) # Print those we're interested in for i in (96, 95, 93, 21, 34, 35): print('Service %d - %s: %s' % (i, sst_dict[i], i in sst)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 21 Jan 2020 22:00:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 22:10:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 22:10:56 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16944/4/pySim/utils.py File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/16944/4/pySim/utils.py at 128 PS4, Line 128: if digit1 != 0XF: This can also be a function like dec_mncc() or parse_mncc(). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 22:10:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 22:57:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 22:57:10 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/pysim/+/16947/6/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16947/6/pySim-read.py at 216 PS6, Line 216: dial_num = res[(x_bytes * 2) + 4:(x_bytes * 2) + 24] I am sorry, but this code is hard to read. AFAIU, the format here is LHV: OCT0 Length of BCD encoded number (excluding ToN/NPI byte) OCT1 X... .... = Extension bit OCT1 .XXX .... = ToN (Type of Number) OCT1 .... XXXX = NPI (Numbering Plan Identification) OCT2... Called Party BCD Number: 1230000091 so the code can be: bcd_len = int(res[0]) bcd_ton = (int(res[1]) >> 4) & 0x07 bcd_npi = int(res[1]) & 0x0f # TODO: extension bit indicates presence of an additional header # TODO: we may want to check the length: assert(bcd_len == len(res[2:])) msisdn_res = swap_nibbles(res[2:]).rstrip('f') Correct me if I am wrong. https://gerrit.osmocom.org/c/pysim/+/16947/6/pySim-read.py at 220 PS6, Line 220: print Makes sense to print ToN / NPI here too. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 22:57:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:14:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:14:37 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 4: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py at 170 PS4, Line 170: parser.add_option Please move it closer to ICCID/IMSI related options, this group and expand the help message (like other options do): "Mobile Subscriber Integrated Services Digital Number". https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim/cards.py at 654 PS4, Line 654: ton = "81" : if msisdn[0] == '+': : ton = "91" Please clarify these values: ton = "XX" # e.g. Local number ton = "YY" # International number Also, this is not just ToN but also NPI? https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim/cards.py at 659 PS4, Line 659: (l== -1) this is always True, isn't it? Also, this variable looks unused. https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim/cards.py at 666 PS4, Line 666: MSISDN with even number of digits are supported Can we just append symbol 'f' at the end of msisdn? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:14:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:15:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:15:45 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py at 170 PS4, Line 170: parser.add_option > Please move it closer to ICCID/IMSI related options, this group and expand the help message (like ot [?] ... this group is more about CSV mode. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:15:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:20:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:20:41 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/4/pySim-prog.py at 279 PS4, Line 279: msisdn = None I also don't see a reason to have this alias. You're not changing opts.msisdn, so just return it (in the end) 'as-is'. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:20:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:21:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:21:59 +0000 Subject: Change in pysim[master]: Added checks for SPN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: Added checks for SPN ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16977/2/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16977/2/pySim-prog.py at 433 PS2, Line 433: name You can still pass opts.name because you're not changing it. No need to have this alias. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:21:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:24:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:24:12 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16945/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16945/5//COMMIT_MSG at 7 PS5, Line 7: Fixed The test output has not changed, so what this change is aimed to fix? Please add more details (at least one line) to the commit message. Thanks! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 23:24:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:24:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:24:25 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 5: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 21 Jan 2020 23:24:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:26:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:26:08 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:26:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:28:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:28:00 +0000 Subject: Change in pysim[master]: Cosmetic/indentation fix In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16973 ) Change subject: Cosmetic/indentation fix ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45d8cb42755003106f9cf21c5f11bdb1d6c817b7 Gerrit-Change-Number: 16973 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jan 2020 23:28:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:31:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:31:53 +0000 Subject: Change in pysim[master]: Provided meaningful message when SPN is not set In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: Provided meaningful message when SPN is not set ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16981/1/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16981/1/pySim-read.py at 158 PS1, Line 158: "Not available" This can be done much simpler: spn = spn_res[0] or "Not available" since '' evaluates to None / False / 0. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 21 Jan 2020 23:31:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 21 23:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jan 2020 23:57:35 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... Patch Set 9: (2 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c at 173 PS9, Line 173: (enum sgsn_ran_type) data; I am pretty sure Coverity is not gonna like this this hack... https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_mm_state_iu_fsm.c File src/sgsn/gprs_mm_state_iu_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_mm_state_iu_fsm.c at 116 PS9, Line 116: E_PMM_RAN_CHANGE I don't see where in the code you dispatch this event. You're sending E_PMM_IMPLICIT_DETACH and E_MM_IMPLICIT_DETACH, but not E_PMM_RAN_CHANGE. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jan 2020 23:57:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jan 22 06:14:15 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jan 2020 06:14:15 +0000 Subject: Build failure of network:osmocom:latest/limesuite in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e27e854d368d_37132b01ab3e45f42744de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/limesuite/Raspbian_10/armv7l Package network:osmocom:latest/limesuite failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest limesuite Last lines of build log: [ 299s] [ 42%] Linking CXX executable boardEmulator [ 299s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/boardEmulator.dir/link.txt --verbose=1 [ 299s] /usr/bin/c++ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -Wl,-z,relro -rdynamic CMakeFiles/boardEmulator.dir/boardEmulator.cpp.o -o boardEmulator -Wl,-rpath,/usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src libLimeSuite.so.19.04.0 -pthread -lusb-1.0 [ 299s] /usr/bin/ld: libLimeSuite.so.19.04.0: undefined reference to `__atomic_load_8' [ 299s] /usr/bin/ld: libLimeSuite.so.19.04.0: undefined reference to `__atomic_store_8' [ 299s] collect2: error: ld returned 1 exit status [ 299s] make[3]: *** [src/CMakeFiles/boardEmulator.dir/build.make:89: src/boardEmulator] Error 1 [ 299s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 299s] make[2]: *** [CMakeFiles/Makefile2:216: src/CMakeFiles/boardEmulator.dir/all] Error 2 [ 310s] [ 43%] Linking CXX static library liboglGraph.a [ 310s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src/oglGraph && /usr/bin/cmake -P CMakeFiles/oglGraph.dir/cmake_clean_target.cmake [ 310s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src/oglGraph && /usr/bin/cmake -E cmake_link_script CMakeFiles/oglGraph.dir/link.txt --verbose=1 [ 310s] /usr/bin/ar qc liboglGraph.a CMakeFiles/oglGraph.dir/dlgMarkers.cpp.o CMakeFiles/oglGraph.dir/GLFont.cpp.o CMakeFiles/oglGraph.dir/OpenGLGraph.cpp.o CMakeFiles/oglGraph.dir/glew/glew.c.o [ 311s] /usr/bin/ranlib liboglGraph.a [ 312s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 312s] [ 43%] Built target oglGraph [ 312s] make[2]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 312s] make[1]: *** [Makefile:133: all] Error 2 [ 312s] make[1]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 312s] dh_auto_build: cd obj-arm-linux-gnueabihf && make -j4 returned exit code 2 [ 312s] make: *** [debian/rules:28: binary] Error 2 [ 312s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 312s] [ 312s] armbuild21 failed "build limesuite_19.04.0-1.dsc" at Wed Jan 22 06:14:09 UTC 2020. [ 312s] [ 312s] ### VM INTERACTION START ### [ 315s] [ 298.253992] sysrq: SysRq : Power Off [ 316s] [ 298.664120] reboot: Power down [ 316s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jan 22 10:49:14 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 10:49:14 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 to look at the new patch set (#2). Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... ipaccess.c: line_already_initialized: int -> bool Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/16980/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 10:49:14 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 10:49:14 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#9) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Patch-by: ewild, osmith Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 214 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/14743/9 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 10:50:21 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 10:50:21 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 9: -Code-Review (4 comments) Refactored as suggested by Pau. Segfault is fixed now. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c File src/e1_input_vty.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 189 PS8, Line 189: line->ipa_kap = talloc_zero(line, struct ipa_keepalive_params); > if you run "e1_line" on VTY twice -> memleak. Good catch! Fixed. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/e1_input_vty.c at 199 PS8, Line 199: ipakeepalive > How about 'ipa-keepalive'? Yes, that's easier to read. Changed. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c at 65 PS8, Line 65: int line_already_initialized; > You are changing this to bool on next commit, better fix it here. "int line_already_initialized" already existed before. That's why I put the change to bool in a separate patch. I've moved the int->bool patch before this one to make it clear. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/8/src/input/ipaccess.c at 66 PS8, Line 66: struct osmo_fsm_inst* ka_fsm[NUM_E1_TS]; > I have the feeling this should not be here but in struct e1i_ts. Agreed. I've refactored the code accordingly and added a helper function to access e1i_ts from bfd and line. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 9 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 10:50:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 11:10:18 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 11:10:18 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#10) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Patch-by: ewild, osmith Related: OS#4070 Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 214 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/14743/10 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 11:12:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 11:12:08 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 11:12:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 11:38:21 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 11:38:21 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: Hello dexter, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16944 to look at the new patch set (#5). Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Fixed MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 42 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 11:43:52 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 11:43:52 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: Hello dexter, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16944 to look at the new patch set (#6). Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Fixed MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 54 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 11:56:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jan 2020 11:56:29 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 11:56:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:09:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 12:09:29 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 6: (2 comments) My comments are not a merge blocker, but still I would love to see them addressed. https://gerrit.osmocom.org/c/pysim/+/16944/6/pySim/utils.py File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/16944/6/pySim/utils.py at 225 PS6, Line 225: digit3 This argument can be optional and set to 0x0f by default. https://gerrit.osmocom.org/c/pysim/+/16944/6/pySim/utils.py at 230 PS6, Line 230: if digit3 == 0xF: This condition is redundant, feel free to remove it. Moreover, both functions can be merged into a single derive_mncc() as they do pretty much the same things. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 12:09:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:12:23 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 12:12:23 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: line_already_initialized: int -> bool In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16980 ) Change subject: ipaccess.c: line_already_initialized: int -> bool ...................................................................... ipaccess.c: line_already_initialized: int -> bool Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 2166524..9eff2f1 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -830,7 +830,7 @@ } struct ipaccess_line { - int line_already_initialized; + bool line_already_initialized; }; static int ipaccess_line_update(struct e1inp_line *line) @@ -851,7 +851,7 @@ if (il->line_already_initialized) return 0; - il->line_already_initialized = 1; + il->line_already_initialized = true; switch(line->ops->cfg.ipa.role) { case E1INP_LINE_R_BSC: { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1cff638664029ef1a592b98cd499e1d8b703ada1 Gerrit-Change-Number: 16980 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:12:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jan 2020 12:12:29 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 10: Code-Review-1 (7 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 74 PS10, Line 74: struct osmo_fsm_inst** ka_fsm; I don't see a point in using pointers to pointers here simply to have 3 shorter lines which fit anyway, so better remove it and use e1i_ts->driver.ipaccess.ka_fsm for everyone's mental sanity :) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 130 PS10, Line 130: struct osmo_fsm_inst** ka_fsm; Again avoid this. If you want, catch any of this in a pointer: ipaccess_line_ts(bfd, line) &ipaccess_line_ts(bfd, line)->driver &ipaccess_line_ts(bfd, line)->driver.ipaccess https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 262 PS10, Line 262: ka_fsm = &ipaccess_line_ts(newbfd, new_line)->driver.ipaccess.ka_fsm; This chunk is mostly copied from the OML part above. Feels like it'd be clearer to have it in a static function. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 304 PS10, Line 304: struct osmo_fsm_inst** ka_fsm = &ipaccess_line_ts(bfd, line)->driver.ipaccess.ka_fsm; Same, avoid pointers to pointers for this kind of use. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 390 PS10, Line 390: struct osmo_fsm_inst* ka_fsm = ipaccess_line_ts(bfd, line)->driver.ipaccess.ka_fsm; I didn't know you could do this with static inline functions (as if it was a macro). Not sure if all compilers are going to like it. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 1045 PS10, Line 1045: if (line->ipa_kap) { I see this chunk of code again and again. I'm sure it can go into a function. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 1111 PS10, Line 1111: if (line->ipa_kap) { Same chunk of code again. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 12:12:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:13:33 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 12:13:33 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 6: > Patch Set 6: > > (2 comments) > > My comments are not a merge blocker, but still I would love to see them addressed. Sorry, i thought it was directed at me to improve before it could be merged -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 12:13:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:31:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 12:31:05 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 10: (2 comments) Agree with pespin. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 74 PS10, Line 74: struct osmo_fsm_inst** ka_fsm; > I don't see a point in using pointers to pointers here simply to have 3 shorter lines which fit anyw [?] ... or introduce a macrco ;) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 130 PS10, Line 130: struct osmo_fsm_inst** ka_fsm; > Again avoid this. If you want, catch any of this in a pointer: [?] #define FOO(e1i_ts) \ ((e1i_ts)->driver.ipaccess.ka_fsm) /* ... */ if (FOO(ipaccess_line_ts(bfd, line))) { osmo_fsm_inst_free(FOO(ipaccess_line_ts(bfd, line))); FOO(ipaccess_line_ts(bfd, line)) = NULL; } Or even better: store the result of ipaccess_line_ts(bfd, line) and make it shorter: struct xxx *e1i_ts = ipaccess_line_ts(bfd, line); if (FOO(e1i_ts)) { osmo_fsm_inst_free(FOO(e1i_ts)); FOO(e1i_ts) = NULL; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 12:31:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 12:35:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 12:35:47 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 6: > Patch Set 6: > > > Patch Set 6: > > > > (2 comments) > > > > My comments are not a merge blocker, but still I would love to see them addressed. > > Sorry, i thought it was directed at me to improve before it could be merged It's ok! I mean I would not insist and block merging as my comments are not critical. P.S. Nice to see your contributions! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 12:35:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 14:36:35 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 14:36:35 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > Patch Set 10: > > (1 comment) I would like to do what you suggested, but i have a question Where do i place the sst_dict? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 14:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 14:46:32 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 14:46:32 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#11) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Patch-by: ewild, osmith Related: OS#4070 Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 205 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/14743/11 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 14:47:08 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 22 Jan 2020 14:47:08 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 11: (6 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 74 PS10, Line 74: struct osmo_fsm_inst** ka_fsm; > I don't see a point in using pointers to pointers here simply to have 3 shorter lines which fit anyw [?] Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 130 PS10, Line 130: struct osmo_fsm_inst** ka_fsm; > Again avoid this. If you want, catch any of this in a pointer: [?] Done. Thanks for the suggestion with the macro; but now that the cleanup function exists, it doesn't even seem necessary. https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 262 PS10, Line 262: ka_fsm = &ipaccess_line_ts(newbfd, new_line)->driver.ipaccess.ka_fsm; > This chunk is mostly copied from the OML part above. [?] Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 304 PS10, Line 304: struct osmo_fsm_inst** ka_fsm = &ipaccess_line_ts(bfd, line)->driver.ipaccess.ka_fsm; > Same, avoid pointers to pointers for this kind of use. Done https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 1045 PS10, Line 1045: if (line->ipa_kap) { > I see this chunk of code again and again. I'm sure it can go into a function. Moved to new function ipaccess_keepalive_fsm_cleanup()... then realized later that you didn't mean the cleanup code above, but the part below. It doesn't hurt to have the cleanup code in a function though, it is used 4 times and saves a few lines. Moved the conn_alloc_keepalive_fsm related code to new functions: - ipaccess_bsc_keepalive_fsm_alloc - ipaccess_bts_keepalive_fsm_alloc (I had it in one function first, but with the differences in callbacks and alloc arguments, two functions seem more readable.) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/10/src/input/ipaccess.c at 1111 PS10, Line 1111: if (line->ipa_kap) { > Same chunk of code again. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 22 Jan 2020 14:47:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 14:56:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 14:56:48 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > Patch Set 10: > > > Patch Set 10: > > > > (1 comment) > > I would like to do what you suggested, but i have a question > > Where do i place the sst_dict? We already have pySim/ts_51_011.py, which corresponds to 3GPP TS 51.011. SIM Service Table is described in section 10.3.7 of this document, so that file is the right place ;) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 14:56:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:05:35 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 15:05:35 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > Patch Set 6: Code-Review-1 > > (2 comments) >From 3GPP TS 24.008, EF-MSISDN, following is my understanding The total length of EF-MSISDN Record length is X+14 bytes, where the first X bytes are Alpha identifier, so the actual number (not supporting extension number, just 10 bytes Dialing number max) will be present in the last 14 bytes (includes BCD length, TON/NPI Capability/Configuration2 Record Identifier and Extension5 Record Identifier as well) of "res". Hence, x_bytes = (len(res)/2) - 14 # xbytes here is the length of alpha identifier in "res" Since in "res" each element (e.g. res[0]) is 4 bits, the BCD length is present in "res" between indexes (x_bytes * 2) and (x_bytes * 2) + 2 Similarly, TON/NPI is present in next byte after BCD length and so on so forth Please correct me if I am wrong. P.S: I have verified the MSISDN programmed on the SIM represented in the same way as it was programmed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 15:05:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:09:16 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 15:09:16 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > Patch Set 6: > > > Patch Set 6: Code-Review-1 > > > > (2 comments) > > From 3GPP TS 24.008, EF-MSISDN, following is my understanding > > The total length of EF-MSISDN Record length is X+14 bytes, where the first X bytes are Alpha identifier, so the actual number (not supporting extension number, just 10 bytes Dialing number max) will be present in the last 14 bytes (includes BCD length, TON/NPI Capability/Configuration2 Record Identifier and Extension5 Record Identifier as well) of "res". > > Hence, > > x_bytes = (len(res)/2) - 14 > # xbytes here is the length of alpha identifier in "res" > > Since in "res" each element (e.g. res[0]) is 4 bits, the BCD length is present in "res" > between indexes (x_bytes * 2) and (x_bytes * 2) + 2 > > Similarly, TON/NPI is present in next byte after BCD length and so on so forth > > Please correct me if I am wrong. > > P.S: I have verified the MSISDN programmed on the SIM represented in the same way as it was programmed Sorry for the wrong 3ggpp document, its ETSI TS 131 102 V13.4.0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 15:09:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:15:16 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 15:15:16 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > P.S: I have verified the MSISDN programmed on the SIM represented in the same way as it was programmed Sorry, i swallowed some of my words :P. I meant, I verified the MSISDN number programmed on the SIM by putting it in a UE and it represented in the same way as it was programmed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 15:15:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:25:58 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 15:25:58 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > Patch Set 10: > > > Patch Set 10: > > > > > Patch Set 10: > > > > > > (1 comment) > > > > I would like to do what you suggested, but i have a question > > > > Where do i place the sst_dict? > > We already have pySim/ts_51_011.py, which corresponds to 3GPP TS 51.011. SIM Service Table is described in section 10.3.7 of this document, so that file is the right place ;) Thank you for the info. I have a small confusion here, I keep referring to ETSI TS 131 102, where the EF-UST (USIM service table) has the same Identifier: '6F38' as the EF-SST in 3GPP TS 51.011, could you please tell me which is the correct one to refer? (I assume it defers from card to car based on application present on it e.g. SIM only, SIM + USIM, SIM + USIM + ISIM) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 15:25:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:48:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 15:48:01 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > Patch Set 6: > > > P.S: I have verified the MSISDN programmed on the SIM represented in the same way as it was programmed > > Sorry, i swallowed some of my words :P. I meant, I verified the MSISDN number programmed on the SIM by putting it in a UE and it represented in the same way as it was programmed Ok, thanks for explanation. I also checked the specs, and here is what I propose: # Make sure mandatory fields are present if len(res) < 14: raise ValueError("EF-MSISDN length is too short") # Skip optional Alpha Identifier xlen = len(res) - 14 msisdn_lhv = res[xlen:][:12] # Parse the length (in bytes) of BCD encoded number # FIXME: it seems the length of ToN/NPI is also included bcd_len = int(msisdn_lhv[0]) if bcd_len > 11: # "This means that the maximum value is 11" raise ValueError("EF-MSISDN contains odd BCD length") # Parse ToN / NPI ton = (int(msisdn_lhv[1]) >> 4) & 0x07 npi = int(msisdn_lhv[1]) & 0x0f bcd_len -= 1 # Parse MSISDN msisdn = swap_nibbles(msisdn_lhv[2:][:bcd_len]).rstrip('f') I did not test this code though... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 15:48:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 15:58:36 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 15:58:36 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > Patch Set 6: > > > Patch Set 6: > > > > > P.S: I have verified the MSISDN programmed on the SIM represented in the same way as it was programmed > > > > Sorry, i swallowed some of my words :P. I meant, I verified the MSISDN number programmed on the SIM by putting it in a UE and it represented in the same way as it was programmed > > Ok, thanks for explanation. I also checked the specs, and here is what I propose: > > # Make sure mandatory fields are present > if len(res) < 14: > raise ValueError("EF-MSISDN length is too short") > > # Skip optional Alpha Identifier > xlen = len(res) - 14 > msisdn_lhv = res[xlen:][:12] > > # Parse the length (in bytes) of BCD encoded number > # FIXME: it seems the length of ToN/NPI is also included > bcd_len = int(msisdn_lhv[0]) > if bcd_len > 11: # "This means that the maximum value is 11" > raise ValueError("EF-MSISDN contains odd BCD length") > > # Parse ToN / NPI > ton = (int(msisdn_lhv[1]) >> 4) & 0x07 > npi = int(msisdn_lhv[1]) & 0x0f > bcd_len -= 1 > > # Parse MSISDN > msisdn = swap_nibbles(msisdn_lhv[2:][:bcd_len]).rstrip('f') > > I did not test this code though... len(res) gives (number of bytes * 2) and the value 14 is in bytes hence, xlen = len(res) - 14 must be as follows xlen = len(res)/2 - 14 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 15:58:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:15:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 16:15:17 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > Patch Set 10: > > Thank you for the info. I have a small confusion here, I keep referring to ETSI TS 131 102, where the EF-UST (USIM service table) has the same Identifier: '6F38' as the EF-SST in 3GPP TS 51.011, could you please tell me which is the correct one to refer? (I assume it defers from card to car based on application present on it e.g. SIM only, SIM + USIM, SIM + USIM + ISIM) Oh, that's a good question! It turns out I was referring the old document, which is not being updated anymore. Sorry. As you have probably noticed, we usually reference 3GPP documents. The one you've mentioned (ETSI TS 131 102) is 3GPP TS 31.102 [1], and the recent (2020-01-08) version of Release 15 approved by ETSI is 15.8.0 [2]. In section 4.2.8 of that document I see 131 services total, and first 59 don't seem to match the services described in 3GPP TS 51.011 [3]. That's why they renamed the table! My best guess is that we should distinguish between SIM (2G/GSM) and USIM (3G/4G/5G), and use a proper table depending on the SIM type. [1] https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1803 [2] https://www.etsi.org/deliver/etsi_ts/131100_131199/131102/15.08.00_60/ts_131102v150800p.pdf [3] https://www.etsi.org/deliver/etsi_ts/151000_151099/151011/04.15.00_60/ts_151011v041500p.pdf -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 16:15:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:18:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 16:18:39 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > I assume it defers from card to car based on application present on it e.g. SIM only, SIM + USIM, SIM + USIM + ISIM I don't think they introduce that many tables. Most likely, only two: for old GSM SIM and USIM (UMTS and higher). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 16:18:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:32:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 16:32:04 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#10) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... WIP: implement ran change between 2g and 3g Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 --- M include/osmocom/sgsn/gprs_gmm_fsm.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_fsm.c 3 files changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/15487/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:32:13 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 16:32:13 +0000 Subject: Change in osmo-sgsn[master]: WIP: implement ran change between 2g and 3g In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: WIP: implement ran change between 2g and 3g ...................................................................... Patch Set 9: (8 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h File include/osmocom/sgsn/gprs_mm_state_iu_fsm.h: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h at 23 PS1, Line 23: E_PMM_RAN_CHANGE > still not adressed in current patch. Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/1/src/sgsn/gprs_gmm.c at 1108 PS1, Line 1108: if (ctx->ran_type == MM_CTX_T_GERAN_Gb) : osmo_fsm_inst_dispatch(ctx->gb.mm_state_fsm, E_MM_RAN_CHANGE, NULL); : : if (ctx->ran_type == MM_CTX_T_UTRAN_Iu) > that could be a switch/case statement, or at least an if/else, as both conditions cannot be true at [?] Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c at 1105 PS2, Line 1105: if (ctx->ran_type == new_ran) > i think it's better this way. These are obsolete now. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c at 1247 PS2, Line 1247: if (MSG_IU_UE_CTX(msg)) > if (ctx->ran_type == MM_CTX_T_GERAN_Gb && MSG_IU_UE_CTX(msg)) [?] Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_gmm.c at 1660 PS2, Line 1660: if (MSG_IU_UE_CTX(msg)) > Same Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_gb_fsm.c File src/sgsn/gprs_mm_state_gb_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_gb_fsm.c at 49 PS2, Line 49: case E_MM_RAN_CHANGE: > right. [?] I think this is handled correctly in newer patches where the RAT change detection logic is directly inside gprs_gsm_fsm and not inside the gb/iu ones. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_iu_fsm.c File src/sgsn/gprs_mm_state_iu_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/2/src/sgsn/gprs_mm_state_iu_fsm.c at 56 PS2, Line 56: case E_PMM_RAN_CHANGE: > Same: it can probably be received in DETACHED state. Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_mm_state_iu_fsm.c File src/sgsn/gprs_mm_state_iu_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_mm_state_iu_fsm.c at 116 PS9, Line 116: E_PMM_RAN_CHANGE > I don't see where in the code you dispatch this event. [?] Your're right, I think this is leftover from before. The RAT_CHANGE detection is now inside gprs_gmm_fsm.c and handles both the Gb and Iu cases. Removing E_PMM_RAN_CHANGE -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 16:32:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:41:01 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 16:41:01 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#11) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... gprs_gmm_fsm.c: Implement RAT change between 2g and 3g Related: OS#2737 Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 --- M include/osmocom/sgsn/gprs_gmm_fsm.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_fsm.c 3 files changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/15487/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 16:51:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 16:51:45 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 6: > len(res) gives (number of bytes * 2) and the value 14 is in bytes hence, You're right, I forgot that scc.read_record() gives us a hexstring. It's so much easier to deal with bytes... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 22 Jan 2020 16:51:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:06:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jan 2020 17:06:09 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: (4 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1232 PS11, Line 1232: if (MSG_IU_UE_CTX(msg) && ctx->ran_type != MM_CTX_T_UTRAN_Iu) Would be nice adding a comment here like: /* Detect MS switched to new a Radio Access technology */ https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1644 PS11, Line 1644: if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) I don't like having this logic repeated in two places (here and in gsm48_rx_gmm_att_req), so a function is welcome here. I am actually wondering whether it would make sense to do this kind of check in the caller of these functions and not on each message type rx() function. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1649 PS11, Line 1649: osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); Why is this line needed/added? comment welcome. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1663 PS11, Line 1663: if (!mmctx->gb.llme) That can only happen if we are in RAT change, so it makes sense to move it in the above code block you are ading imho. BTW, in Iu->GERAN change don't you probably need to set it to NULL? I have this feeling this kind of stuff shouldn't be done here but in the FSM when receiving the E_GMM_RAT_CHANGE event. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 17:06:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:06:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jan 2020 17:06:50 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: Can you please also submit the patch with the TTCN3 tests enabled you are using to test this? so we can already have them running in jenkins (even if failing). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 17:06:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:14:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jan 2020 17:14:15 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Fix compatibility with Python 3: print() is a function Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 --- M README.md M pySim-prog.py M pySim-read.py M pySim/card_handler.py M pySim/transport/serial.py 5 files changed, 49 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/16982/1 diff --git a/README.md b/README.md index 85b9a57..7074ffa 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ sl.wait_for_card() # Print IMSI -print sc.read_binary(['3f00', '7f20', '6f07']) +print(sc.read_binary(['3f00', '7f20', '6f07'])) # Run A3/A8 -print sc.run_gsm('00112233445566778899aabbccddeeff') +print(sc.run_gsm('00112233445566778899aabbccddeeff')) diff --git a/pySim-prog.py b/pySim-prog.py index b070c5e..bfb40b2 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -173,7 +173,7 @@ if options.type == 'list': for kls in _cards_classes: - print kls.name + print(kls.name) sys.exit(0) if options.probe: @@ -560,7 +560,7 @@ for k in BATCH_INCOMPATIBLE: if getattr(opts, k): - print "Incompatible option with batch_state: %s" % (k,) + print("Incompatible option with batch_state: %s" % (k,)) sys.exit(-1) # Don't load state if there is none ... @@ -568,7 +568,7 @@ return if not os.path.isfile(opts.batch_state): - print "No state file yet" + print("No state file yet") return # Get stored data @@ -601,12 +601,12 @@ for kls in _cards_classes: card = kls.autodetect(scc) if card: - print "Autodetected card type: %s" % card.name + print("Autodetected card type: %s" % card.name) card.reset() break if card is None: - print "Autodetection failed" + print("Autodetection failed") return if opts.type == "auto_once": @@ -631,7 +631,7 @@ # Get card card = card_detect(opts, scc) if card is None: - print "No card detected!" + print("No card detected!") return -1 # Probe only @@ -640,7 +640,7 @@ # Erase if requested if opts.erase: - print "Formatting ..." + print("Formatting ...") card.erase() card.reset() @@ -666,16 +666,16 @@ imsi = opts.imsi cp = read_params_csv(opts, imsi=imsi, iccid=iccid) if cp is None: - print "Error reading parameters from CSV file!\n" + print("Error reading parameters from CSV file!\n") return 2 print_parameters(cp) if opts.dry_run is False: # Program the card - print "Programming ..." + print("Programming ...") card.program(cp) else: - print "Dry Run: NOT PROGRAMMING!" + print("Dry Run: NOT PROGRAMMING!") # Write parameters permanently write_parameters(opts, cp) @@ -716,9 +716,9 @@ # If we use a CSV file as data input, check if the CSV file exists. if opts.source == 'csv': - print "Using CSV file as data input: " + str(opts.read_csv) + print("Using CSV file as data input: " + str(opts.read_csv)) if not os.path.isfile(opts.read_csv): - print "CSV file not found!" + print("CSV file not found!") sys.exit(1) # Batch mode init @@ -737,18 +737,18 @@ try: rc = process_card(opts, first, card_handler) except (KeyboardInterrupt): - print "" - print "Terminated by user!" + print("") + print("Terminated by user!") sys.exit(0) except (SystemExit): raise except: - print "" - print "Card programming failed with an execption:" - print "---------------------8<---------------------" + print("") + print("Card programming failed with an execption:") + print("---------------------8<---------------------") traceback.print_exc() - print "---------------------8<---------------------" - print "" + print("---------------------8<---------------------") + print("") rc = -1 # Something did not work as well as expected, however, lets diff --git a/pySim-read.py b/pySim-read.py index 662ee54..b59b7f3 100644 --- a/pySim-read.py +++ b/pySim-read.py @@ -140,7 +140,7 @@ else: print("PLMNsel: Can't read, response code = %s" % (sw,)) except Exception as e: - print "HPLMNAcT: Can't read file -- " + str(e) + print("HPLMNAcT: Can't read file -- " + str(e)) # EF.PLMNwAcT try: @@ -150,7 +150,7 @@ else: print("PLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: - print "PLMNwAcT: Can't read file -- " + str(e) + print("PLMNwAcT: Can't read file -- " + str(e)) # EF.OPLMNwAcT try: @@ -160,7 +160,7 @@ else: print("OPLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: - print "OPLMNwAcT: Can't read file -- " + str(e) + print("OPLMNwAcT: Can't read file -- " + str(e)) # EF.HPLMNAcT try: @@ -170,7 +170,7 @@ else: print("HPLMNAcT: Can't read, response code = %s" % (sw,)) except Exception as e: - print "HPLMNAcT: Can't read file -- " + str(e) + print("HPLMNAcT: Can't read file -- " + str(e)) # EF.ACC (res, sw) = scc.read_binary(['3f00', '7f20', '6f78']) @@ -191,7 +191,7 @@ else: print("MSISDN: Can't read, response code = %s" % (sw,)) except Exception as e: - print "MSISDN: Can't read file -- " + str(e) + print("MSISDN: Can't read file -- " + str(e)) # EF.AD (res, sw) = scc.read_binary(['3f00', '7f20', '6fad']) @@ -201,4 +201,4 @@ print("AD: Can't read, response code = %s" % (sw,)) # Done for this card and maybe for everything ? - print "Done !\n" + print("Done !\n") diff --git a/pySim/card_handler.py b/pySim/card_handler.py index 46ec93e..147d877 100644 --- a/pySim/card_handler.py +++ b/pySim/card_handler.py @@ -36,16 +36,14 @@ self.sl = sl def get(self, first = False): - print "Ready for Programming: Insert card now (or CTRL-C to cancel)" + print("Ready for Programming: Insert card now (or CTRL-C to cancel)") self.sl.wait_for_card(newcardonly=not first) def error(self): - print "Programming failed: Remove card from reader" - print "" + print("Programming failed: Remove card from reader\n") def done(self): - print "Programming successful: Remove card from reader" - print "" + print("Programming successful: Remove card from reader\n") # Automatic card handler: A machine is used to handle the cards. class card_handler_auto: @@ -55,7 +53,7 @@ verbose = True def __init__(self, sl, config_file): - print "Card handler Config-file: " + str(config_file) + print("Card handler Config-file: " + str(config_file)) self.sl = sl with open(config_file) as cfg: self.cmds = yaml.load(cfg, Loader=yaml.FullLoader) @@ -63,22 +61,22 @@ self.verbose = (self.cmds.get('verbose') == True) def __print_outout(self,out): - print "" - print "Card handler output:" - print "---------------------8<---------------------" + print("") + print("Card handler output:") + print("---------------------8<---------------------") stdout = out[0].strip() if len(stdout) > 0: - print "stdout:" - print stdout + print("stdout:") + print(stdout) stderr = out[1].strip() if len(stderr) > 0: - print "stderr:" - print stderr - print "---------------------8<---------------------" - print "" + print("stderr:") + print(stderr) + print("---------------------8<---------------------") + print("") def __exec_cmd(self, command): - print "Card handler Commandline: " + str(command) + print("Card handler Commandline: " + str(command)) proc = subprocess.Popen([command], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) out = proc.communicate() @@ -88,21 +86,21 @@ self.__print_outout(out) if rc != 0: - print "" - print "Error: Card handler failure! (rc=" + str(rc) + ")" + print("") + print("Error: Card handler failure! (rc=" + str(rc) + ")") sys.exit(rc) def get(self, first = False): - print "Ready for Programming: Transporting card into the reader-bay..." + print("Ready for Programming: Transporting card into the reader-bay...") self.__exec_cmd(self.cmds['get']) self.sl.connect() def error(self): - print "Programming failed: Transporting card to the error-bin..." + print("Programming failed: Transporting card to the error-bin...") self.__exec_cmd(self.cmds['error']) - print "" + print("") def done(self): - print "Programming successful: Transporting card into the collector bin..." + print("Programming successful: Transporting card into the collector bin...") self.__exec_cmd(self.cmds['done']) - print "" + print("") diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index 7a2bfd3..f672be2 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -162,7 +162,7 @@ def _dbg_print(self, s): if self._debug: - print s + print(s) def _tx_byte(self, b): self._sl.write(b) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:21:24 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:21:24 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: > Patch Set 11: > > Can you please also submit the patch with the TTCN3 tests enabled you are using to test this? so we can already have them running in jenkins (even if failing). The tests actually crash the SGSN without this patch (which is the reason they were disabled in the first place I think). I'll push a change and mark it WIP -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 17:21:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:30:16 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:30:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd Change-Id: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Related: OS#3727 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16983/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index f070429..eb1fff2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -677,7 +677,9 @@ /* update TLLI */ g_pars.tlli_old := g_pars.tlli; g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O; - f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + if (is_gb(ran_index)) { + f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + } } function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { @@ -2407,6 +2409,7 @@ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))) + repeat; } [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } [is_iu(ran_index)] BSSAP.receive { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:30:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:30:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash Change-Id: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Related: OS#3727 --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/16984/1 diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 786961f..2b63b4e 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -85,9 +85,8 @@ control { execute( TC_iu_attach() ); - /* FIXME: will crash the sgsn - * execute( TC_iu_attach_geran_rau() ); - * execute( TC_geran_attach_iu_rau() ); */ + execute( TC_iu_attach_geran_rau() ); + execute( TC_geran_attach_iu_rau() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:32:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 to look at the new patch set (#2). Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash Depends: osmo-sgsn I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Change-Id: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Related: OS#3727 --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/16984/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:32:34 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:32:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 22 Jan 2020 17:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 17:33:08 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 17:33:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 2: Will crash the jenkins test until I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 is merged -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 22 Jan 2020 17:33:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 18:08:28 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 22 Jan 2020 18:08:28 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: (3 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1644 PS11, Line 1644: if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) > I don't like having this logic repeated in two places (here and in gsm48_rx_gmm_att_req), so a funct [?] Do we also want to trigger a RAT change for other messages (like service request, ...)? Without looking at a spec my feeling is that this is not permitted. Still it would probably be good to move this test to gsm0408_rcv_gmm() and return an error if the msg_type is not RA_UPD_REQ or ATTACH_REQ). https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1649 PS11, Line 1649: osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); > Why is this line needed/added? comment welcome. Good question, I'm not really sure. It's called in ptmsi_update anyway in line 1672 so maybe it's redundant (what if PTMSI_ALLOC is not defined)? https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1663 PS11, Line 1663: if (!mmctx->gb.llme) > That can only happen if we are in RAT change, so it makes sense to move it in the above code block y [?] I'd the pass a proper struct as user pointer to osmo_fsm_inst_dispatch() with the new ran_type and llme pointer/other information. Does that make sense? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jan 2020 18:08:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 22 18:31:24 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Wed, 22 Jan 2020 18:31:24 +0000 Subject: Change in pysim[master]: Read USIM Service table from SIM In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16943 ) Change subject: Read USIM Service table from SIM ...................................................................... Patch Set 10: > Patch Set 10: > > > I assume it defers from card to car based on application present on it e.g. SIM only, SIM + USIM, SIM + USIM + ISIM > > I don't think they introduce that many tables. Most likely, only two: for old GSM SIM and USIM (UMTS and higher). Apparently there is a third Service table for ISIM https://www.etsi.org/deliver/etsi_ts/131100_131199/131103/14.01.01_60/ts_131103v140101p.pdf Section 4.2.7 Eitherway, you are right, there is a need to parse S/U/I Service table based on AID of the card -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9586f156dd43d724a73e989b4bac157d8eb8bc5d Gerrit-Change-Number: 16943 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jan 2020 18:31:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Jan 23 00:02:43 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 23 Jan 2020 00:02:43 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-osmo-sip-connector_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,a4=3Dde?= =?UTF-8?Q?fault,osmocom-master-debian9_#2072?= Message-ID: <233902641.1583.1579737763169.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Jan 23 10:50:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 10:50:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 10:50:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 10:50:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 10:50:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 2: Code-Review+1 It's fine crashing since they are at the end. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 10:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 11:06:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 11:06:31 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: (4 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1644 PS11, Line 1644: if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) > Do we also want to trigger a RAT change for other messages (like service request, ... [?] we need to find out before merging this patch blindly. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1649 PS11, Line 1649: osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); > Good question, I'm not really sure. [?] So we need to find out before merging this patch blindly. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1663 PS11, Line 1663: if (!mmctx->gb.llme) > I'd the pass a proper struct as user pointer to osmo_fsm_inst_dispatch() with the new ran_type and l [?] Agree, you probably want to pass new_rat_type, llme and msg. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c at 165 PS11, Line 165: gmm_fsm_state_chg(fi, ST_GMM_DEREGISTERED); I'm wondering whether the mmctx ran type needs to be set here too, or some stuff needs to be deallocated (since there's no .onenter function for that state). -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 11:06:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 12:38:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 12:38:19 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16946 to look at the new patch set (#5). Change subject: Support for MSISDN programming ...................................................................... Support for MSISDN programming Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 --- M pySim-prog.py M pySim-read.py M pySim/cards.py 3 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 14:34:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 14:34:19 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#8). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 8 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 14:43:11 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 14:43:11 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#9). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/9 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 9 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 14:57:18 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 14:57:18 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#10). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/10 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 10 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:02:06 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 15:02:06 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#11). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 11 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:13:44 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 15:13:44 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#12). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 32 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/12 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 12 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:17:08 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 15:17:08 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#13). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 32 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/13 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 13 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:28:22 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 15:28:22 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#14). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/14 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 14 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:29:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 15:29:59 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Patch Set 1: Weird how the IMSI remains the same, but other data read and the card reader nr changes. print and print() aren't necessarily always equivalent, but I saw only print()s that should be equivalent in this patch. I thought retriggering the run would fix some odd sporadic failure, but neither that. Curious! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Thu, 23 Jan 2020 15:29:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 15:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 23 Jan 2020 15:32:10 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16947 to look at the new patch set (#15). Change subject: Fixed reading of MSISDN parameter ...................................................................... Fixed reading of MSISDN parameter Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/15 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 15 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 18:05:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 18:05:25 +0000 Subject: Change in osmo-pcu[master]: cosmetic: csn1.cpp: Fix whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16985 ) Change subject: cosmetic: csn1.cpp: Fix whitespace ...................................................................... cosmetic: csn1.cpp: Fix whitespace Change-Id: I663c5c20a878b3643db6a8ddd58e29bc9fe93d80 --- M src/csn1.cpp 1 file changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/16985/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 6203a44..3a8a81b 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -69,7 +69,7 @@ result &= maskBits[no_of_bits]; } else - { + { guint8 hight_part = (0x2B ^ ((guint8)bitvec_read_field(vector, &readIndex, 8))) & maskBits[8 - relative_bit_offset]; hight_part = (guint8) (hight_part << (-bit_shift)); result = (0x2B ^ ((guint8)bitvec_read_field(vector, &readIndex, 8))) >> (8 + bit_shift); @@ -605,7 +605,7 @@ /* Assign UnionType */ pui8 = pui8DATA(data, pDescr->offset); *pui8 = index; - + /* script index to continue on, limited in case we do not have a power of 2 */ pDescr += (MIN(index + 1, count)); @@ -1119,7 +1119,7 @@ no_of_bits -= 8; } if (no_of_bits > 0) - { + { *pui8 = bitvec_read_field(vector, &readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; @@ -1329,7 +1329,7 @@ ElementCount++; LOGPC(DCSN1, LOGL_NOTICE, "%s { | ", pDescr->sz); - + csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); @@ -1818,7 +1818,7 @@ } else { - // Has already been processed: + // Has already been processed: return Status; } @@ -1848,9 +1848,9 @@ //read index from data and write to vector bitvec_write_field(vector, &writeIndex, *pui8, Bits); - //decode index + //decode index writeIndex -= Bits; - + while (Bits > 0) { index <<= 1; @@ -2666,4 +2666,3 @@ return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); } - -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I663c5c20a878b3643db6a8ddd58e29bc9fe93d80 Gerrit-Change-Number: 16985 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 20:54:55 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jan 2020 20:54:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... Patch Set 1: Code-Review-1 @daniel can split the commits? Because you're fixing two different bugs here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 20:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 20:59:58 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jan 2020 20:59:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 2: How do we know if it's ran against latest and nightly? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jan 2020 20:59:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:04:42 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jan 2020 21:04:42 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1644 PS11, Line 1644: if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) > we need to find out before merging this patch blindly. The problem overall is, we have to refactor the full Attach Request/RAU logic. After a AttachRequest/RAU is started, it's not allowed to do anything else. however before the authentication went through, we can't be sure, that this is our subscriber. RAT changes only happens by Handover (not implemented), AttachRequest or RAU. It's not possible to do a Service Reqeust -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:04:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:24:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:24:00 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: X timers: IMHO we should even use unique X timer numbers across osmocom programs. I think we need a wiki page like https://osmocom.org/projects/cellular-infrastructure/wiki/Port_Numbers but for X timers. So far I introduced new timers without much thought, but I think that was a probably not doing it properly. https://osmocom.org/issues/4376 tdef_groups: as in the TODO comment, it seems that this patch rewrites exactly what osmo_tdef_group does. The test libosmocore/tests/tdef/tdef_vty_test_config_root is an example for using osmo_tdef_group. You can look at the vty commands it provides in tdef_vty_test_config_root.vty or try it live with ? ./tdef_vty_test_config_root <0000> ../../../../src/libosmocore/src/vty/telnet_interface.c:104 Available via telnet 127.0.0.1 42042 ? telnet localhost 42042 tdef_vty_test> list ... show timer [(tea|test|software)] [TNNNN] tdef_vty_test> enable tdef_vty_test# configure terminal tdef_vty_test(config)# timer test test: T1 = 100 s Testing a hundred seconds (default: 100 s) test: T2 = 100 ms Testing a hundred milliseconds (default: 100 ms) test: T3 = 100 m Testing a hundred minutes (default: 100 m) test: T4 = 100 Testing a hundred potatoes (default: 100) test: T2147483647 = 4294967295 m Very large (default: 4294967295 m) test: X23 = 239471 s Negative T number (default: 239471 s) test: T30 = 50 s Testing range min (default: 50 s, range: [20 .. inf]) test: T31 = 50 s Testing range max (default: 50 s, range: [0 .. 52]) test: T32 = 50 s Testing range both (default: 50 s, range: [20 .. 52]) Seems to me all that it takes is - create a timer group struct array with mgw, mncc, sccp, geran, utran and sgs in it, - run osmo_tdef_vty_groups_init(), - call osmo_tdef_vty_groups_write() all done. You won't have an additional 'ran' keyword in there, but I think we can also just drop it, or you could prefix each name like ran-geran, ran-utran, ran-sgs if you really need to keep it. Of course the tdef_vty API allows for flexibility like in this patch on purpose, but we'd save a bunch of code dup using the group API directly. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:24:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:26:30 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:26:30 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 679 PS1, Line 679: return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1); > There is noting wrong with pointer arithmetic, it's just the matter of style. [?] /me approves of 'argv + 1' The alternative would be &argv[1], and it's all the same anyway. https://gerrit.osmocom.org/c/osmo-msc/+/16932/1/src/libmsc/msc_vty.c at 780 PS1, Line 780: /* TODO: can we use osmo_tdef_group for that? */ (here is the TODO I was referring to in the previous comment) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:26:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:29:43 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:29:43 +0000 Subject: Change in osmo-msc[master]: VTY: mark 'subscriber create imsi' command as deprecated In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16954 ) Change subject: VTY: mark 'subscriber create imsi' command as deprecated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 Gerrit-Change-Number: 16954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:29:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:49:40 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:49:40 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 2: Code-Review-1 (2 comments) (-1 just for the typo, the rest is +0) Possible problem here is changing the meaning of the T3212 value. In 3GPP specs, AFAIU, this timer number is defined to be of that weird format. If we use T3212 as name, I guess we should also stick to the 3GPP definition of its value. Personally, I much prefer a unit of plain minutes from a user perspective. But not sure if we should introduce this inconsistency. a) users moving the timer to the new vty config and not understanding the different number value (would the config change?), b) techies setting T3212 according to spec and getting a different timeout; Can you take a look at 3GPP specs concerning T3212? I don't have a really strong opinion, but maybe you can prove my concern not justified or also just think through it again and then decide what you think it should be... https://gerrit.osmocom.org/c/osmo-msc/+/16934/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/16934/2/src/libmsc/msc_vty.c at 326 PS2, Line 326: vty_out(vty, "%% Setting T2312 to %d minutes " digit swap typo T2312 https://gerrit.osmocom.org/c/osmo-msc/+/16934/2/src/libmsc/msc_vty.c at 344 PS2, Line 344: "timeout.%s", VTY_NEWLINE); this message looks like the command refused to do anything. but ok. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:49:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:54:08 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:54:08 +0000 Subject: Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16923 ) Change subject: VTY: fix writing of custom timer values to a configuration file ...................................................................... Patch Set 1: Code-Review+2 goodness, didn't anyone *test* this code before merging? who wrote this nonsense?? It's preposterous! As soon as I find out who did this, I'll...! ..... ...thank fixeria for sorting it out. ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 Gerrit-Change-Number: 16923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:54:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:55:43 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:55:43 +0000 Subject: Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16923 ) Change subject: VTY: fix writing of custom timer values to a configuration file ...................................................................... Patch Set 1: also again raises the task I started a long time ago and never finished: move the osmo-bsc vty tests to osmo_verify_transcript_vty.py tests -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 Gerrit-Change-Number: 16923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:55:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:56:57 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:56:57 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: neels has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Removed Code-Review+2 by pespin -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 21:57:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 21:57:26 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 2: (to make sure that this doesn't get merged before reading the comment I removed the +2 vote.) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 21:57:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:11:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 22:11:02 +0000 Subject: Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16923 ) Change subject: VTY: fix writing of custom timer values to a configuration file ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+2 > > goodness, didn't anyone *test* this code before merging? The problem is that we don't (yet) have the VTY transcription tests (like we do e.g. in OsmoMSC)... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 Gerrit-Change-Number: 16923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 22:11:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:11:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 22:11:27 +0000 Subject: Change in osmo-bsc[master]: VTY: fix writing of custom timer values to a configuration file In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16923 ) Change subject: VTY: fix writing of custom timer values to a configuration file ...................................................................... VTY: fix writing of custom timer values to a configuration file Calling osmo_tdef_vty_write() twice: with and without the 'timer ' prefix definitely looks like a bug. After setting any timer to a custom (non-default) value, config_write_net() would generate an incorrect configuration file: $ osmo-bsc -c /tmp/osmo-bsc.cfg There is no such command. Error occurred during reading the below line: T10 10 Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 1195d65..d1a268d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1062,8 +1062,6 @@ ho_vty_write_net(vty, gsmnet); - osmo_tdef_vty_write(vty, gsmnet->T_defs, " "); - if (!gsmnet->dyn_ts_allow_tch_f) vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE); if (gsmnet->tz.override != 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5cc893fb2077bb21f1f661e30a7ab2af1b9bd561 Gerrit-Change-Number: 16923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:15:46 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 22:15:46 +0000 Subject: Change in osmo-pcu[master]: cosmetic: csn1.cpp: Fix whitespace In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16985 ) Change subject: cosmetic: csn1.cpp: Fix whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I663c5c20a878b3643db6a8ddd58e29bc9fe93d80 Gerrit-Change-Number: 16985 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 23 Jan 2020 22:15:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:28:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jan 2020 22:28:32 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 15: Code-Review+1 (4 comments) I don't really know much about pysim, just adding some comments to show appreciation of contribution from names I haven't seen before :) https://gerrit.osmocom.org/c/pysim/+/16947/15//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16947/15//COMMIT_MSG at 7 PS15, Line 7: Fixed reading of MSISDN parameter would be nice to add a brief explanation that this adds MSISDN parsing, and what kinds of MSISDN are fixed by this patch https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 218 PS15, Line 218: xlen = len(bytes_res) - 14 (is it always exactly 14?) https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 219 PS15, Line 219: msisdn_lhv = bytes_res[xlen:][:12] (a comment to explain how and why this splits the data would be nice) https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 222 PS15, Line 222: if bcd_len != int('ff', 16): "int('ff', 16)": rather just write 255 or 0xff -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 15 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 23 Jan 2020 22:28:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:43:59 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jan 2020 22:43:59 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 to look at the new patch set (#3). Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Add vty `imsi unknown cause` to set the reject cause Allow to set the reject cause when an IMSI is unknown to the HLR. Most common on reject causes are GMM_CAUSE_IMSI_UNKNOWN (2) or CAUSE_ROAMING_NOTALLOWED (11). Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a --- M doc/examples/osmo-hlr.cfg M include/osmocom/hlr/hlr.h M src/hlr.c M src/hlr_vty.c M tests/test_nodes.vty 5 files changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/08/16808/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 22:48:11 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jan 2020 22:48:11 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 to look at the new patch set (#4). Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Add vty `imsi unknown cause` to set the reject cause Allow to set the reject cause when an IMSI is unknown to the HLR. Most common on reject causes are GMM_CAUSE_IMSI_UNKNOWN (2) or CAUSE_ROAMING_NOTALLOWED (11). Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a --- M doc/examples/osmo-hlr.cfg M include/osmocom/hlr/hlr.h M src/hlr.c M src/hlr_vty.c M tests/test_nodes.vty 5 files changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/08/16808/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:08:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 23:08:36 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 2: Hi Neels, > Possible problem here is changing the meaning of the T3212 value. > If we use T3212 as name, I guess we should also stick to the 3GPP definition of its value. I think after the split of OsmoNiTB it has already lost its original meaning. I personally find the current description of T3212 misleading as it may seem like we're broadcasting this value in System Information Type 3, while we do not. We could of course rename it to X3212, but do we really want to do that? > In 3GPP specs, AFAIU, this timer number is defined to be of that weird format. That weird format only applies to the coding of its value in SI3 message, which is quite limited in terms of its maximum size (23 octets). We already accept the values in minutes, and here we never deal with the contents of SI3, so I don't see a point in using that 'compression' for the internal state... > b) techies setting T3212 according to spec and getting a different timeout; Fortunately, we do not accept the value of T3212 in deci-hours, as the specs. define it ;) > a) users moving the timer to the new vty config and not understanding the different number value (would the config change?) Well, yeah. This magic multiplication (2 * T3212 + 1) comes from the NiTB times. However, as a user when I am setting T3212 to 30 minutes, I basically expect a subscriber to expire in 30 minutes and not in 61 (currently this transformation is opaque). That's why I am printing a warning that we're emulating the old behaviour. > (-1 just for the typo, the rest is +0) Nice catch! Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 23:08:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:18:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 23:18:52 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: print test name at the start References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16986 ) Change subject: tests/rlcmac: print test name at the start ...................................................................... tests/rlcmac: print test name at the start Change-Id: Ib8f0fcbd6bb68d77727c021f0d90d5248e895772 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/86/16986/1 diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 61026ed..acfe56a 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -40,6 +40,7 @@ void printSizeofRLCMAC() { + printf("*** %s ***\n", __func__); cout << "sizeof RlcMacUplink_t " << sizeof(RlcMacUplink_t) << endl; cout << "sizeof Packet_Cell_Change_Failure_t " << sizeof(Packet_Cell_Change_Failure_t) << endl; cout << "sizeof Packet_Control_Acknowledgement_t " << sizeof(Packet_Control_Acknowledgement_t) << endl; @@ -88,6 +89,7 @@ void testRlcMacDownlink(void *test_ctx) { + printf("*** %s ***\n", __func__); struct bitvec *resultVector = bitvec_alloc(23, test_ctx); bitvec_unhex(resultVector, DUMMY_VEC); @@ -155,6 +157,7 @@ void testRlcMacUplink(void *test_ctx) { + printf("*** %s ***\n", __func__); struct bitvec *resultVector = bitvec_alloc(23, test_ctx); bitvec_unhex(resultVector, DUMMY_VEC); @@ -217,6 +220,7 @@ void testCsnLeftAlignedVarBmpBounds(void *test_ctx) { + printf("*** %s ***\n", __func__); struct msgb *m = msgb_alloc(80, "test"); static uint8_t exp[] = { 0x7f, 0xff, 0xff, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; bitvec *vector = bitvec_alloc(23, test_ctx); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 896982d..d61c62f 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -1,3 +1,4 @@ +*** testRlcMacDownlink *** DOWNLINK vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== @@ -55,6 +56,7 @@ vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE +*** testRlcMacUplink *** UPLINK vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== @@ -96,3 +98,4 @@ vector1 = 40a90200000000301012a80132b2b2b2b2b vector2 = 40a90200000000301012a80132b2b2b2b2b vector1 == vector2 : TRUE +*** testCsnLeftAlignedVarBmpBounds *** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8f0fcbd6bb68d77727c021f0d90d5248e895772 Gerrit-Change-Number: 16986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:18:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 23:18:53 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... tests/rlcmac: Fix missing commas with unexpected results It can be seen that decoding+encoding for one othe msg bugs generates different packet than the first one. It's left as a future exercise to investigate it since it's preventing fix of other issues. Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/87/16987/1 diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index acfe56a..c607883 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -100,10 +100,10 @@ "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment (EGPRS) "40284f0000001009810c826f4406809dcecb2b2b2b2b2b", // Packet Uplink Assignment (EGPRS) - "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Ack Nack (EGPRS) - "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" - "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b" - "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b" + "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Ack Nack (EGPRS) + "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b", // Polling Request? + "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b", // Packet Uplink Ack Nack? + "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // System Info 13? }; int testDataSize = sizeof(testData)/sizeof(testData[0]); @@ -166,7 +166,7 @@ "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request "40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // EPDAN - "400a9020000000000000003010012a0800132b2b2b2b2b" + "400a9020000000000000003010012a0800132b2b2b2b2b", // Packet Downlink Ack/Nack ? }; int testDataSize = sizeof(testData)/sizeof(testData[0]); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index d61c62f..1508cf3 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -56,6 +56,30 @@ vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE +vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 4913432b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 == vector2 : FALSE +vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector2 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 == vector2 : TRUE +vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 == vector2 : TRUE *** testRlcMacUplink *** UPLINK vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:18:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 23:18:54 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... tests/rlcmac: Use osmo_hexdump to print buffers Old method takes lots of lines of codes and prints inn unconfortable way because left-trailing zeros are dropped, making it difficult to split in bytes. Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 50 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/16988/1 diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index c607883..0721fd1 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -111,14 +111,9 @@ cout << " DOWNLINK " << endl; for (int i = 0; i < testDataSize; i++) { + cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << hex << (unsigned)*(vector->data + i); - } - cout << endl; RlcMacDownlink_t * data = (RlcMacDownlink_t *)malloc(sizeof(RlcMacDownlink_t)); cout << "=========Start DECODE===========" << endl; decode_gsm_rlcmac_downlink(vector, data); @@ -126,26 +121,12 @@ cout << "=========Start ENCODE=============" << endl; encode_gsm_rlcmac_downlink(resultVector, data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(vector->data + i); - } - cout << endl; - cout << "vector2 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(resultVector->data + i); - } - cout << endl; + cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; + cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; if (memcmp(vector->data, resultVector->data, 23) == 0) - { cout << "vector1 == vector2 : TRUE" << endl; - } else - { cout << "vector1 == vector2 : FALSE" << endl; - } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); free(data); @@ -175,14 +156,9 @@ cout << " UPLINK " << endl; for (int i = 0; i < testDataSize; i++) { + cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << hex << (unsigned)*(vector->data + i); - } - cout << endl; RlcMacUplink_t * data = (RlcMacUplink_t *)malloc(sizeof(RlcMacUplink_t)); cout << "=========Start DECODE===========" << endl; decode_gsm_rlcmac_uplink(vector, data); @@ -190,26 +166,12 @@ cout << "=========Start ENCODE=============" << endl; encode_gsm_rlcmac_uplink(resultVector, data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(vector->data + i); - } - cout << endl; - cout << "vector2 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(resultVector->data + i); - } - cout << endl; + cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; + cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; if (memcmp(vector->data, resultVector->data, 23) == 0) - { cout << "vector1 == vector2 : TRUE" << endl; - } else - { cout << "vector1 == vector2 : FALSE" << endl; - } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); free(data); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 1508cf3..64aafc3 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -1,125 +1,125 @@ *** testRlcMacDownlink *** DOWNLINK -vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b +vector1 = 4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b -vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b +vector1 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector1 = 48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b -vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector1 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b +vector1 = 47240c00400000000000000079eb2ac9402b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b -vector2 = 4724c040000000079eb2ac9402b2b2b2b2b2b +vector1 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b +vector2 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b +vector1 = 400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b -vector2 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b +vector1 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector1 = 40284f0000001009810c826f4406809dcecb2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b -vector2 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector1 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b +vector2 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b +vector1 = 4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b -vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4913432b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 49 13 e0 08 50 88 40 13 a8 04 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 49 13 43 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : FALSE -vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 = 412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b -vector2 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b +vector2 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testRlcMacUplink *** UPLINK -vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector1 = 400b8020000000000000002480e0032b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b -vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector1 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b +vector1 = 4016713dc094270ca2ae57ef909006aa0fc0001f80222b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b -vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b +vector1 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b +vector2 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b vector1 == vector2 : TRUE -vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40a90200000000301012a80132b2b2b2b2b +vector1 = 400a9020000000000000003010012a0800132b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40a90200000000301012a80132b2b2b2b2b -vector2 = 40a90200000000301012a80132b2b2b2b2b +vector1 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b +vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testCsnLeftAlignedVarBmpBounds *** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:18:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jan 2020 23:18:54 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16989 ) Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... tests/rlcmac: Memzero decoded struct Otherwise final output is undefined. Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/89/16989/1 diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 0721fd1..039cdf8 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -114,12 +114,13 @@ cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - RlcMacDownlink_t * data = (RlcMacDownlink_t *)malloc(sizeof(RlcMacDownlink_t)); + RlcMacDownlink_t data; + memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; - decode_gsm_rlcmac_downlink(vector, data); + decode_gsm_rlcmac_downlink(vector, &data); cout << "+++++++++Finish DECODE++++++++++" << endl; cout << "=========Start ENCODE=============" << endl; - encode_gsm_rlcmac_downlink(resultVector, data); + encode_gsm_rlcmac_downlink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; @@ -129,7 +130,6 @@ cout << "vector1 == vector2 : FALSE" << endl; bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); - free(data); } bitvec_free(resultVector); @@ -159,12 +159,13 @@ cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - RlcMacUplink_t * data = (RlcMacUplink_t *)malloc(sizeof(RlcMacUplink_t)); + RlcMacUplink_t data; + memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; - decode_gsm_rlcmac_uplink(vector, data); + decode_gsm_rlcmac_uplink(vector, &data); cout << "+++++++++Finish DECODE++++++++++" << endl; cout << "=========Start ENCODE=============" << endl; - encode_gsm_rlcmac_uplink(resultVector, data); + encode_gsm_rlcmac_uplink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; @@ -174,7 +175,6 @@ cout << "vector1 == vector2 : FALSE" << endl; bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); - free(data); } bitvec_free(resultVector); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 64aafc3..2af4d90 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -62,7 +62,7 @@ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ vector1 = 49 13 e0 08 50 88 40 13 a8 04 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b -vector2 = 49 13 43 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 49 13 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : FALSE vector1 = 412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b =========Start DECODE=========== -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:24:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 23:24:08 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 15: (3 comments) https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 218 PS15, Line 218: xlen = len(bytes_res) - 14 > (is it always exactly 14?) Yes, you basically habe an optional variable-sized buffer followed by several mandatory fields. https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 219 PS15, Line 219: msisdn_lhv = bytes_res[xlen:][:12] > (a comment to explain how and why this splits the data would be nice) A comment with the spec. reference would be the best explanation ;) https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 222 PS15, Line 222: if bcd_len != int('ff', 16): > "int('ff', 16)": rather just write 255 or 0xff ACK. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 15 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 23 Jan 2020 23:24:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:28:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 23:28:11 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/5/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/5/pySim-prog.py at 282 PS5, Line 282: msisdn = msisdn[1:] Why are you stripping '+' here? I believe it's needed by Card.program() to determine NPI/ToN. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 23 Jan 2020 23:28:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:29:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 23:29:43 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/5/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/16946/5/pySim-prog.py at 282 PS5, Line 282: msisdn = msisdn[1:] > Why are you stripping '+' here? I believe it's needed by Card.program() to determine NPI/ToN. Ah, nevermind. I just realized that you pass opts.msisdn as-is anyway, and this is only needed for two following checks. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 23 Jan 2020 23:29:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 23 23:57:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jan 2020 23:57:10 +0000 Subject: Change in osmo-hlr[master]: Add vty `imsi unknown cause` to set the reject cause In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `imsi unknown cause` to set the reject cause ...................................................................... Patch Set 4: Code-Review-1 (6 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 49 PS4, Line 49: "roaming-not-allowed" }, No need to break the line. https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 85 PS4, Line 85: get_value_string_or_null We should not get NULL if everything is correct I think. https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 88 PS4, Line 88: imsi_cause_code Why not just g_hlr->imsi_unknown_cause != GMM_CAUSE_IMSI_UNKNOWN (it's the default). https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 356 PS4, Line 356: imsi unknown cause You have to add help string for every singe word of the command. Otherwise help message would be broken. Feel free to replace three vectors "imsi unknown cause" by one "subscriber-reject-cause" (so we can also avoid repeating "imsi unknown cause imsi-unknown"): "subscriber-reject-cause (...)", "Define Location Updating Reject cause to be send in case the subscriber is not known\n" "Cause value 0xXX (IMSI unknown)\n" "Cause value 0xXX (Roaming not allowed)" https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 357 PS4, Line 357: GSUP cause This is actually GSM 04.08 GMM cause if I understand correctly. https://gerrit.osmocom.org/c/osmo-hlr/+/16808/4/src/hlr_vty.c at 365 PS4, Line 365: Cannot find cause value to %s%s This shall not happen because VTY would not accept any other values than 'imsi-unknown' and 'roaming-not-allowed'. You can just do OSMO_ASSERT() to avoid Coverity warnings. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jan 2020 23:57:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 00:15:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 00:15:56 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 to look at the new patch set (#2). Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... tests/rlcmac: Memzero decoded struct Otherwise final output is undefined. Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/89/16989/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 04:24:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 24 Jan 2020 04:24:07 +0000 Subject: Change in osmo-gsm-manuals[master]: fix srcdir to reflect $abs_srcdir References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 ) Change subject: fix srcdir to reflect $abs_srcdir ...................................................................... fix srcdir to reflect $abs_srcdir When building .adoc files, we pass a srcdir variable to allow including files that are only in the source tree, but not in the build tree. However, so far {srcdir} is a relative path, and when an .adoc file includes an .adoc file in a subdir, then the directive include::{srcdir} is evaluated relative to the .adoc file in the subdir, not in the original make CWD. Hence the path ends up pointing at the wrong place. Fix this by passing an absolute path as srcdir instead. I discovered this here: osmo-hlr/doc/manuals/osmohlr-usermanual.adoc: include::{srcdir}/chapters/proxy_cache.adoc[] osmo-hlr/doc/manuals/chapters/proxy_cache.adoc: ["mscgen"] ---- include::{srcdir}/chapters/proxy_cache_attach.msc[] ---- (Note that I could have just removed "{srcdir}/chapters/" since .adoc and .msc are in the same dir, but the point of this patch is to make {srcdir} generally useful in all levels of included .adoc files.) The above resulted in: asciidoc: include: /n/s/dev/src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: osmohlr-usermanual.adoc: line 29: reading: /n/s/dev/src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: WARNING: proxy_cache.adoc: line 263: include file not found: /n/s/dev/src/src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc Note that /n/s/dev/src/src/osmo-hlr should only have one 'src' element. With $abs_srcdir this becomes: asciidoc: include: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: osmohlr-usermanual.adoc: line 29: reading: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: include: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc asciidoc: proxy_cache.adoc: line 263: reading: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc I have not investigated whether/why all the other 'include::' all over the place seem to be working -- maybe we never include .adoc in subdirectories that in turn use {srcdir}? Or we have lots of missing images we didn't notice yet? Todo: the missing include should have fatally broken the build, but it just builds the PDF with missing images. a) the mscgen plugin finding empty content and b) the missing .png files should have caused the build to abort? Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/90/16990/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 54969fc..63c2bea 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -37,7 +37,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(abs_srcdir)' -a commondir='$(COMMONDIR)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b Gerrit-Change-Number: 16990 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 10:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 10:08:32 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16989 ) Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 10:08:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 10:09:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 10:09:11 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: print test name at the start In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16986 ) Change subject: tests/rlcmac: print test name at the start ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8f0fcbd6bb68d77727c021f0d90d5248e895772 Gerrit-Change-Number: 16986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 10:09:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 10:10:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 10:10:00 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 10:10:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 10:11:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 10:11:04 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 10:11:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:05:33 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 24 Jan 2020 11:05:33 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16946 to look at the new patch set (#6). Change subject: Support for MSISDN programming ...................................................................... Support for MSISDN programming Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 --- M pySim-prog.py M pySim-read.py M pySim/cards.py 3 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:05:33 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 24 Jan 2020 11:05:33 +0000 Subject: Change in pysim[master]: Added checks for SPN In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16977 to look at the new patch set (#3). Change subject: Added checks for SPN ...................................................................... Added checks for SPN Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 --- M pySim-prog.py M pySim/cards.py 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/16977/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:05:34 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 24 Jan 2020 11:05:34 +0000 Subject: Change in pysim[master]: Added feature to parse Service table based on SIM type. If USIM is pr... References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used ...................................................................... Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 --- M pySim-read.py A pySim/ts_31_102.py M pySim/ts_51_011.py M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 10 files changed, 259 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/16991/1 diff --git a/pySim-read.py b/pySim-read.py index 4e17b42..1210852 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -28,7 +28,8 @@ import random import re import sys -from pySim.ts_51_011 import EF, DF +from pySim.ts_51_011 import EF, DF, EF_SST_map +from pySim.ts_31_102 import EF_UST_map try: import json @@ -37,7 +38,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn, parse_st def parse_options(): @@ -114,31 +115,37 @@ else: print("IMSI: Can't read, response code = %s" % (sw,)) - # EF.SST + # Determine whether the has just SIM or SIM+USIM or SIM+USIM+ISIM + # First (known) halves of the AID + aid_usim = "a0000000871002" + aid_isim = "a0000000871004" + + sim_type = [] + # Find out how many records the EF.DIR has + aid_record_count = scc.record_count(['3f00', '2F00']) + for i in range(0, aid_record_count): + record = scc.read_record(['3f00', '2F00'], i + 1) + if aid_isim in record[0]: + sim_type.append("ISIM") + elif aid_usim in record[0]: + sim_type.append("USIM") + else: + sim_type.append("SIM") + + # EF.SST/EF.UST - Base on SIM type + # Both EF.SST and EF.UST have same identifier - 6F38 (res, sw) = scc.read_binary(EF['SST']) if sw == '9000': - swapped = swap_nibbles(res) - print("USIM Service Table: %s" % swapped) - if len(res) >= 24: - byte12 = int(swapped[(12*2) - 2:(12*2)], 16) - service96 = (byte12&0x80 == 0x80) - print("Service 96 - Non-Access Stratum configuration by USIM: %s" % service96) - service95 = (byte12&0x40 == 0x40) - print("Service 95 - Support of UICC access to IMS: %s" % service95) - service93 = (byte12&0x10 == 0x10) - print("Service 93 - Communication Control for IMS by USIM: %s" % service93) - if len(res) >= 6: - byte3 = int(swapped[(3*2) - 2:(3*2)], 16) - service21 = (byte3&0x10 == 0x10) - print("Service 21 - MSISDN: %s" % service21) - if len(res) >= 10: - byte5 = int(swapped[(5*2) - 2:(5*2)], 16) - service34 = (byte5&0x02 == 0x02) - service35 = (byte5&0x04 == 0x04) - print("Service 34 - Enabled Services Table: %s" % service34) - print("Service 35 - APN Control List (ACL): %s" % service35) + # Get list of available services + avail_srvcs = parse_st(res) + srvc_map = EF_SST_map + if "USIM" in sim_type: + srvc_map = EF_UST_map + # Print those we're interested in + for s in (96, 95, 93, 21, 34, 35): + print('Service %d - %s: %s' % (s, srvc_map[s], s in avail_srvcs)) else: - print("USIM Service Table: Can't read, response code = %s" % (sw,)) + print("Service Table: Can't read, response code = %s" % (sw,)) # EF.SMSP (res, sw) = scc.read_record(['3f00', '7f10', '6f42'], 1) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py new file mode 100644 index 0000000..c29aa04 --- /dev/null +++ b/pySim/ts_31_102.py @@ -0,0 +1,138 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +Various constants from ETSI TS 131 102 +""" + +# +# Copyright (C) 2020 Supreeth Herle +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# Mapping between USIM Service Number and its description +EF_UST_map = { + 1: 'Local Phone Book', + 2: 'Fixed Dialling Numbers (FDN)', + 3: 'Extension 2', + 4: 'Service Dialling Numbers (SDN)', + 5: 'Extension3', + 6: 'Barred Dialling Numbers (BDN)', + 7: 'Extension4', + 8: 'Outgoing Call Information (OCI and OCT)', + 9: 'Incoming Call Information (ICI and ICT)', + 10: 'Short Message Storage (SMS)', + 11: 'Short Message Status Reports (SMSR)', + 12: 'Short Message Service Parameters (SMSP)', + 13: 'Advice of Charge (AoC)', + 14: 'Capability Configuration Parameters 2 (CCP2)', + 15: 'Cell Broadcast Message Identifier', + 16: 'Cell Broadcast Message Identifier Ranges', + 17: 'Group Identifier Level 1', + 18: 'Group Identifier Level 2', + 19: 'Service Provider Name', + 20: 'User controlled PLMN selector with Access Technology', + 21: 'MSISDN', + 22: 'Image (IMG)', + 23: 'Support of Localised Service Areas (SoLSA)', + 24: 'Enhanced Multi-Level Precedence and Pre-emption Service', + 25: 'Automatic Answer for eMLPP', + 26: 'RFU', + 27: 'GSM Access', + 28: 'Data download via SMS-PP', + 29: 'Data download via SMS-CB', + 30: 'Call Control by USIM', + 31: 'MO-SMS Control by USIM', + 32: 'RUN AT COMMAND command', + 33: 'shall be set to 1', + 34: 'Enabled Services Table', + 35: 'APN Control List (ACL)', + 36: 'Depersonalisation Control Keys', + 37: 'Co-operative Network List', + 38: 'GSM security context', + 39: 'CPBCCH Information', + 40: 'Investigation Scan', + 41: 'MexE', + 42: 'Operator controlled PLMN selector with Access Technology', + 43: 'HPLMN selector with Access Technology', + 44: 'Extension 5', + 45: 'PLMN Network Name', + 46: 'Operator PLMN List', + 47: 'Mailbox Dialling Numbers', + 48: 'Message Waiting Indication Status', + 49: 'Call Forwarding Indication Status', + 50: 'Reserved and shall be ignored', + 51: 'Service Provider Display Information', + 52: 'Multimedia Messaging Service (MMS)', + 53: 'Extension 8', + 54: 'Call control on GPRS by USIM', + 55: 'MMS User Connectivity Parameters', + 56: 'Network\'s indication of alerting in the MS (NIA)', + 57: 'VGCS Group Identifier List (EFVGCS and EFVGCSS)', + 58: 'VBS Group Identifier List (EFVBS and EFVBSS)', + 59: 'Pseudonym', + 60: 'User Controlled PLMN selector for I-WLAN access', + 61: 'Operator Controlled PLMN selector for I-WLAN access', + 62: 'User controlled WSID list', + 63: 'Operator controlled WSID list', + 64: 'VGCS security', + 65: 'VBS security', + 66: 'WLAN Reauthentication Identity', + 67: 'Multimedia Messages Storage', + 68: 'Generic Bootstrapping Architecture (GBA)', + 69: 'MBMS security', + 70: 'Data download via USSD and USSD application mode', + 71: 'Equivalent HPLMN', + 72: 'Additional TERMINAL PROFILE after UICC activation', + 73: 'Equivalent HPLMN Presentation Indication', + 74: 'Last RPLMN Selection Indication', + 75: 'OMA BCAST Smart Card Profile', + 76: 'GBA-based Local Key Establishment Mechanism', + 77: 'Terminal Applications', + 78: 'Service Provider Name Icon', + 79: 'PLMN Network Name Icon', + 80: 'Connectivity Parameters for USIM IP connections', + 81: 'Home I-WLAN Specific Identifier List', + 82: 'I-WLAN Equivalent HPLMN Presentation Indication', + 83: 'I-WLAN HPLMN Priority Indication', + 84: 'I-WLAN Last Registered PLMN', + 85: 'EPS Mobility Management Information', + 86: 'Allowed CSG Lists and corresponding indications', + 87: 'Call control on EPS PDN connection by USIM', + 88: 'HPLMN Direct Access', + 89: 'eCall Data', + 90: 'Operator CSG Lists and corresponding indications', + 91: 'Support for SM-over-IP', + 92: 'Support of CSG Display Control', + 93: 'Communication Control for IMS by USIM', + 94: 'Extended Terminal Applications', + 95: 'Support of UICC access to IMS', + 96: 'Non-Access Stratum configuration by USIM', + 97: 'PWS configuration by USIM', + 98: 'RFU', + 99: 'URI support by UICC', + 100: 'Extended EARFCN support', + 101: 'ProSe', + 102: 'USAT Application Pairing', + 103: 'Media Type support', + 104: 'IMS call disconnection cause', + 105: 'URI support for MO SHORT MESSAGE CONTROL', + 106: 'ePDG configuration Information support', + 107: 'ePDG configuration Information configured', + 108: 'ACDC support', + 109: 'MCPTT', + 110: 'ePDG configuration Information for Emergency Service support', + 111: 'ePDG configuration Information for Emergency Service configured', +} \ No newline at end of file diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 754d57f..1cec91f 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -249,3 +249,66 @@ 'MMSUP': DF['GSM']+[EF_num['MMSUP']], 'MMSUCP': DF['GSM']+[EF_num['MMSUCP']], } + +# Mapping between SIM Service Number and its description +EF_SST_map = { + 1: 'CHV1 disable function', + 2: 'Abbreviated Dialling Numbers (ADN)', + 3: 'Fixed Dialling Numbers (FDN)', + 4: 'Short Message Storage (SMS)', + 5: 'Advice of Charge (AoC)', + 6: 'Capability Configuration Parameters (CCP)', + 7: 'PLMN selector', + 8: 'RFU', + 9: 'MSISDN', + 10: 'Extension1', + 11: 'Extension2', + 12: 'SMS Parameters', + 13: 'Last Number Dialled (LND)', + 14: 'Cell Broadcast Message Identifier', + 15: 'Group Identifier Level 1', + 16: 'Group Identifier Level 2', + 17: 'Service Provider Name', + 18: 'Service Dialling Numbers (SDN)', + 19: 'Extension3', + 20: 'RFU', + 21: 'VGCS Group Identifier List (EFVGCS and EFVGCSS)', + 22: 'VBS Group Identifier List (EFVBS and EFVBSS)', + 23: 'enhanced Multi-Level Precedence and Pre-emption Service', + 24: 'Automatic Answer for eMLPP', + 25: 'Data download via SMS-CB', + 26: 'Data download via SMS-PP', + 27: 'Menu selection', + 28: 'Call control', + 29: 'Proactive SIM', + 30: 'Cell Broadcast Message Identifier Ranges', + 31: 'Barred Dialling Numbers (BDN)', + 32: 'Extension4', + 33: 'De-personalization Control Keys', + 34: 'Co-operative Network List', + 35: 'Short Message Status Reports', + 36: 'Network\'s indication of alerting in the MS', + 37: 'Mobile Originated Short Message control by SIM', + 38: 'GPRS', + 39: 'Image (IMG)', + 40: 'SoLSA (Support of Local Service Area)', + 41: 'USSD string data object supported in Call Control', + 42: 'RUN AT COMMAND command', + 43: 'User controlled PLMN Selector with Access Technology', + 44: 'Operator controlled PLMN Selector with Access Technology', + 45: 'HPLMN Selector with Access Technology', + 46: 'CPBCCH Information', + 47: 'Investigation Scan', + 48: 'Extended Capability Configuration Parameters', + 49: 'MExE', + 50: 'Reserved and shall be ignored', + 51: 'PLMN Network Name', + 52: 'Operator PLMN List', + 53: 'Mailbox Dialling Numbers', + 54: 'Message Waiting Indication Status', + 55: 'Call Forwarding Indication Status', + 56: 'Service Provider Display Information', + 57: 'Multimedia Messaging Service (MMS)', + 58: 'Extension 8', + 59: 'MMS User Connectivity Parameters', +} \ No newline at end of file diff --git a/pySim/utils.py b/pySim/utils.py index fbe3e47..2d71ade 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -252,4 +252,24 @@ mcc += digit2 * 10 if digit3 != 0XF: mcc += digit3 - return mcc \ No newline at end of file + return mcc + +def parse_st(st): + """ + Parses the EF S/UST and returns available/supported services + """ + swapped = swap_nibbles(st) + print("Service Table: %s" % swapped) + swapped_bytes = [swapped[i:i+2] for i in range(0, len(swapped), 2) ] + avail_srvc = [] + # Get each byte and check for available services + for i in range(0, len(swapped_bytes)): + byte = int(swapped_bytes[i], 16) + for j in range(1, 9): + if byte&0x01 == 0x01: + # Byte X contains info about Services num (8X-7) to num (8X) + # bit = 1: service available + # bit = 0: service not available + avail_srvc.append((8*i) + j) + byte = byte >> 1 + return avail_srvc diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 149b9b4..d1b62f2 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 8988219000000117833 IMSI: 001010000000111 -USIM Service Table: ffc33cff30f0fff000f0ff300f0c +Service Table: ffc33cff30f0fff000f0ff300f0c Service 96 - Non-Access Stratum configuration by USIM: False Service 95 - Support of UICC access to IMS: False Service 93 - Communication Control for IMS by USIM: True diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 8214a4c..0347401 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 89445310150011013678 IMSI: 001010000000102 -USIM Service Table: ff33fff0c300fff000c00f0c0f300000 +Service Table: ff33fff0c300fff000c00f0c0f300000 Service 96 - Non-Access Stratum configuration by USIM: False Service 95 - Support of UICC access to IMS: False Service 93 - Communication Control for IMS by USIM: False diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index be24539..be5f8f4 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 -USIM Service Table: fff3fff030000f3000c0 +Service Table: fff3fff030000f3000c0 Service 21 - MSISDN: True Service 34 - Enabled Services Table: False Service 35 - APN Control List (ACL): False diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index 7161b55..d40944c 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 8988211900000000004 IMSI: 001010000000102 -USIM Service Table: ff33fffff300f3f003c00f3c0f0000 +Service Table: ff33fffff300f3f003c00f3c0f0000 Service 96 - Non-Access Stratum configuration by USIM: False Service 95 - Support of UICC access to IMS: False Service 93 - Communication Control for IMS by USIM: True diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 25f14d8..43fa43b 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 -USIM Service Table: fff3fffff300f3f10fc0000c0f0000 +Service Table: fff3fffff300f3f10fc0000c0f0000 Service 96 - Non-Access Stratum configuration by USIM: False Service 95 - Support of UICC access to IMS: False Service 93 - Communication Control for IMS by USIM: False diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index b26433b..f466f9f 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -2,7 +2,7 @@ Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 -USIM Service Table: fff3fff0f00000300000 +Service Table: fff3fff0f00000300000 Service 21 - MSISDN: True Service 34 - Enabled Services Table: False Service 35 - APN Control List (ACL): False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:13:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:13:39 +0000 Subject: Change in osmo-gsm-manuals[master]: fix srcdir to reflect $abs_srcdir In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 ) Change subject: fix srcdir to reflect $abs_srcdir ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b Gerrit-Change-Number: 16990 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jan 2020 11:13:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:17:57 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 24 Jan 2020 11:17:57 +0000 Subject: Change in pysim[master]: Added feature to parse Service table based on SIM type. If USIM is pr... In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used ...................................................................... Patch Set 1: > Patch Set 1: Verified-1 > > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/280/ : FAILURE Can someone please have a look into the error message for sysmosim-gr1 and let me know why its throwing that error? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Comment-Date: Fri, 24 Jan 2020 11:17:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:24:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:24:26 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 11: (2 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c at 198 PS11, Line 198: if (ka_fsm && msg_type == IPAC_MSGT_PONG) Can't we do this inside the switch statement in line 220? https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c at 402 PS11, Line 402: ipaccess_drop(bfd, line); isn't ipacces_drop already calling ipaccess_keepalive_fsm_cleanup? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 24 Jan 2020 11:24:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:30:06 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: print test name at the start In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16986 ) Change subject: tests/rlcmac: print test name at the start ...................................................................... tests/rlcmac: print test name at the start Change-Id: Ib8f0fcbd6bb68d77727c021f0d90d5248e895772 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 61026ed..acfe56a 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -40,6 +40,7 @@ void printSizeofRLCMAC() { + printf("*** %s ***\n", __func__); cout << "sizeof RlcMacUplink_t " << sizeof(RlcMacUplink_t) << endl; cout << "sizeof Packet_Cell_Change_Failure_t " << sizeof(Packet_Cell_Change_Failure_t) << endl; cout << "sizeof Packet_Control_Acknowledgement_t " << sizeof(Packet_Control_Acknowledgement_t) << endl; @@ -88,6 +89,7 @@ void testRlcMacDownlink(void *test_ctx) { + printf("*** %s ***\n", __func__); struct bitvec *resultVector = bitvec_alloc(23, test_ctx); bitvec_unhex(resultVector, DUMMY_VEC); @@ -155,6 +157,7 @@ void testRlcMacUplink(void *test_ctx) { + printf("*** %s ***\n", __func__); struct bitvec *resultVector = bitvec_alloc(23, test_ctx); bitvec_unhex(resultVector, DUMMY_VEC); @@ -217,6 +220,7 @@ void testCsnLeftAlignedVarBmpBounds(void *test_ctx) { + printf("*** %s ***\n", __func__); struct msgb *m = msgb_alloc(80, "test"); static uint8_t exp[] = { 0x7f, 0xff, 0xff, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; bitvec *vector = bitvec_alloc(23, test_ctx); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 896982d..d61c62f 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -1,3 +1,4 @@ +*** testRlcMacDownlink *** DOWNLINK vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== @@ -55,6 +56,7 @@ vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE +*** testRlcMacUplink *** UPLINK vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== @@ -96,3 +98,4 @@ vector1 = 40a90200000000301012a80132b2b2b2b2b vector2 = 40a90200000000301012a80132b2b2b2b2b vector1 == vector2 : TRUE +*** testCsnLeftAlignedVarBmpBounds *** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8f0fcbd6bb68d77727c021f0d90d5248e895772 Gerrit-Change-Number: 16986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:42:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:42:21 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 to look at the new patch set (#3). Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... tests/rlcmac: Memzero decoded struct Otherwise final output is undefined. Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/89/16989/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:42:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:42:21 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 to look at the new patch set (#2). Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... tests/rlcmac: Fix missing commas with unexpected results Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/87/16987/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:42:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:42:21 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 to look at the new patch set (#2). Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... tests/rlcmac: Use osmo_hexdump to print buffers Old method takes lots of lines of codes and prints inn unconfortable way because left-trailing zeros are dropped, making it difficult to split in bytes. Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 52 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/16988/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 11:46:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 11:46:25 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Don't check stderr output References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16992 ) Change subject: tests/rlcmac: Don't check stderr output ...................................................................... tests/rlcmac: Don't check stderr output Current stderr output is empty anyway, and not checking it allows enavling different log levels to easily debug issues. Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 --- D tests/rlcmac/RLCMACTest.err M tests/testsuite.at 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/16992/1 diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err deleted file mode 100644 index e69de29..0000000 --- a/tests/rlcmac/RLCMACTest.err +++ /dev/null diff --git a/tests/testsuite.at b/tests/testsuite.at index 8a319bd..fe87ff9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -5,8 +5,7 @@ AT_SETUP([rlcmac]) AT_KEYWORDS([rlcmac]) cat $abs_srcdir/rlcmac/RLCMACTest.ok > expout -cat $abs_srcdir/rlcmac/RLCMACTest.err > experr -AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [experr]) +AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [ignore]) AT_CLEANUP AT_SETUP([multi_slot]) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 Gerrit-Change-Number: 16992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 12:03:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 12:03:35 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Don't check stderr output In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 to look at the new patch set (#2). Change subject: tests/rlcmac: Don't check stderr output ...................................................................... tests/rlcmac: Don't check stderr output Current stderr output is empty anyway, and not checking it allows enavling different log levels to easily debug issues. Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 --- M tests/Makefile.am D tests/rlcmac/RLCMACTest.err M tests/testsuite.at 3 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/16992/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 Gerrit-Change-Number: 16992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 12:03:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 12:03:36 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails Currently code using that function in osmo-pcu is disabled, allegadly because SGSN was sending incorrect values, but it looks more like a CSN1 issue. Related: OS#1525, OS#3499 Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 4 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/16993/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ef7abcd..339279c 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -5510,10 +5510,10 @@ } } -void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data) +int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data) { csnStream_t ar; unsigned readIndex = 0; csnStreamInit(&ar, 0, 8 * vector->data_len); - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data); + return csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data); } diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index a4750e8..0ac1207 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -5137,5 +5137,5 @@ void encode_gsm_rlcmac_uplink(bitvec * vector, RlcMacUplink_t * data); void decode_gsm_rlcmac_uplink_data(bitvec * vector, RlcMacUplinkDataBlock_t * data); void encode_gsm_rlcmac_downlink_data(bitvec * vector, RlcMacDownlinkDataBlock_t * data); - void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data); + int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data); #endif /* __PACKET_GSM_RLCMAC_H__ */ diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index e48a27c..63b2e27 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -23,9 +23,11 @@ #include #include #include +#include #include "csn1.h" #include "gsm_rlcmac.h" #include "gprs_rlcmac.h" +#include "decoding.h" extern "C" { extern const struct log_info gprs_log_info; @@ -38,6 +40,8 @@ } using namespace std; +void *tall_pcu_ctx; + void printSizeofRLCMAC() { printf("*** %s ***\n", __func__); @@ -203,6 +207,31 @@ msgb_free(m); } +void testRAcap(void *test_ctx) +{ + printf("*** %s ***\n", __func__); + MS_Radio_Access_capability_t data; + memset(&data, 0, sizeof(data)); + bitvec *vector = bitvec_alloc(23, test_ctx); + int rc; + + bitvec_unhex(vector, "12a5146200"); + + rc = decode_gsm_ra_cap(vector, &data); + printf("decode_gsm_ra_cap fails? %s\n", rc !=0 ? "yes" : "no"); + /* FIXME: OS#1525, OS#3499: csn1 fails to parse this MS RA Cap IE value */ + //assert (rc == 0); + + /* Make sure there's 1 value (currently fails due to failed decoding) */ + //osmo_assert(cap->Count_MS_RA_capability_value == 1); + + /* Make sure MS multislot class is parsed correctly (currently fails due + to failed decoding and count being 0) */ + //uint8_t ms_class = Decoding::get_ms_class_by_capability(&data); + //assert(ms_class == 3); + +} + int main(int argc, char *argv[]) { void *ctx = talloc_named_const(NULL, 1, "RLCMACTest"); @@ -213,5 +242,6 @@ testRlcMacDownlink(ctx); testRlcMacUplink(ctx); testCsnLeftAlignedVarBmpBounds(ctx); + testRAcap(ctx); talloc_free(ctx); } diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 2af4d90..5793d57 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -123,3 +123,5 @@ vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testCsnLeftAlignedVarBmpBounds *** +*** testRAcap *** +decode_gsm_ra_cap fails? yes -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 12:07:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 12:07:11 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails Currently code using that function in osmo-pcu is disabled, allegadly because SGSN was sending incorrect values, but it looks more like a CSN1 issue. Related: OS#1525, OS#3499 Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 4 files changed, 48 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/16993/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 12:49:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 24 Jan 2020 12:49:22 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c at 198 PS11, Line 198: if (ka_fsm && msg_type == IPAC_MSGT_PONG) > Can't we do this inside the switch statement in line 220? No,ipa_ccm_rcvmsg_base eats it. THis is what "peek" hints at, we just do additional processing without "handling" the meassage. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 24 Jan 2020 12:49:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 13:35:45 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 24 Jan 2020 13:35:45 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#12) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Patch-by: ewild, osmith Related: OS#4070 Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 204 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/14743/12 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 13:36:51 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 24 Jan 2020 13:36:51 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 12: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/14743/11/src/input/ipaccess.c at 402 PS11, Line 402: ipaccess_drop(bfd, line); > isn't ipacces_drop already calling ipaccess_keepalive_fsm_cleanup? It is, removed. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 24 Jan 2020 13:36:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 15:33:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 15:33:20 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 24 Jan 2020 15:33:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:54 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16994 ) Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... csn1: Update M_NULL CSN_DESCR to match wireshark Port from iwireshark.git commit cc6d4341e65ef2e8d8488fe0ac0f236ece0dd844. It looks like it makes no difference to us now, but other EGPRS messages may use it in the future. Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 --- M src/csn1.cpp M src/csn1.h M src/gsm_rlcmac.cpp 3 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/16994/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 6203a44..9ddb9c1 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -190,6 +190,7 @@ case CSN_NULL: { /* Empty member! */ + bit_offset += pDescr->i; pDescr++; break; } @@ -631,6 +632,7 @@ case CSN_NULL: { /* Empty member! */ + bit_offset += pDescr->i; pDescr++; break; } diff --git a/src/csn1.h b/src/csn1.h index 1015e69..39e6625 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -592,8 +592,8 @@ #define M_PADDING_BITS(_STRUCT)\ {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {(StreamSerializeFcn_t)0}} -#define M_NULL(_STRUCT, _MEMBER)\ - {CSN_NULL, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} +#define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} #define M_THIS_EXIST(_STRUCT)\ {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 339279c..c1d3b97 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -605,7 +605,7 @@ static const CSN_ChoiceElement_t SI13_PBCCH_Description_Channel[] = {/* this one is used in SI13*/ - {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy)},/*Default to BCCH carrier*/ + {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ {2, 0x01 , M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, {1, 0x01 , M_UINT(PBCCH_Description_t, u.MAIO, 6)}, }; @@ -3064,7 +3064,7 @@ static const CSN_DESCR_BEGIN (Delete_All_Stored_Individual_Priorities_t) - M_NULL (Delete_All_Stored_Individual_Priorities_t, dummy), + M_NULL (Delete_All_Stored_Individual_Priorities_t, dummy, 0), CSN_DESCR_END (Delete_All_Stored_Individual_Priorities_t) static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:55 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function Fort from wireshark.git commit fd9f182f4b13a3d81b1b5c797a6e4b9d6d327fdd. Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/16995/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 9ddb9c1..1174347 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -147,7 +147,7 @@ { gint remaining_bits_len = ar->remaining_bits_len; gint bit_offset = ar->bit_offset; - guint8* pui8; + guint8* pui8 = NULL; guint16* pui16; guint32* pui32; guint64* pui64; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:56 +0000 Subject: Change in osmo-pcu[master]: csn1: shuffle decrements of remaining_bits_len References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16996 ) Change subject: csn1: shuffle decrements of remaining_bits_len ...................................................................... csn1: shuffle decrements of remaining_bits_len So that they always occur next to an increment of bit_offset. Port from wireshark.git 1c81971d4292438ffdf83e9f9b9ab96c133c785b. Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 --- M src/csn1.cpp 1 file changed, 14 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/16996/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 1174347..20b6c6f 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1243,6 +1243,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, &readIndex, 1)); /* existNextElement() returned FALSE, 1 bit consumed */ bit_offset++; + remaining_bits_len --; /* Store the counted number of elements of the array */ *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; @@ -1567,7 +1568,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= no_of_bits; if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1608,7 +1608,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= (no_of_bits*nCount); if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1617,6 +1616,7 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; } while (--nCount > 0); } @@ -1887,7 +1887,7 @@ pui8 = pui8DATA(data, pDescr->offset); bitvec_write_field(vector, &writeIndex, *pui8, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; + remaining_bits_len --; bit_offset++; pDescr++; break; @@ -1904,8 +1904,6 @@ guint8 no_of_bits = (guint8) pDescr->i; if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= no_of_bits; - if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1934,6 +1932,7 @@ return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); } + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; pDescr++; break; @@ -2026,7 +2025,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= (no_of_bits*nCount); if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -2035,6 +2033,7 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; } while (--nCount > 0); } @@ -2191,8 +2190,9 @@ writeIndex--; bitvec_write_field(vector, &writeIndex, fExist, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz, (unsigned)fExist); + remaining_bits_len --; + bit_offset++; pDescr++; - remaining_bits_len -= 1; if (!exist) { @@ -2222,9 +2222,9 @@ bitvec_write_field(vector, &writeIndex, *pui8, 1); fExist = *pui8; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; - ++bit_offset; + remaining_bits_len --; + bit_offset++; if (fExist == 0) { /* Skip 'i' entries */ @@ -2247,12 +2247,6 @@ /* skip 'i' entries + this entry */ pDescr += pDescr->i + 1; - /* pDescr now must be pointing to a CSN_END entry, if not this is an error */ - if ( pDescr->type != CSN_END ) - { /* substract one more bit from remaining_bits_len to make the "not enough bits" error to be triggered */ - remaining_bits_len--; - } - /* set the data member to "not exist" */ //*pui8 = 0; break; @@ -2265,8 +2259,8 @@ writeIndex--; bitvec_write_field(vector, &writeIndex, fExist, 1); pui8++; - remaining_bits_len -= 1; + remaining_bits_len --; bit_offset++; if (fExist == 0) @@ -2299,7 +2293,6 @@ if (no_of_bits > 0) { - remaining_bits_len -= no_of_bits; if (remaining_bits_len < 0) { @@ -2317,6 +2310,7 @@ pui8++; no_of_bits -= nB1; bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + remaining_bits_len -= nB1; } /* remaining no_of_bits is a multiple of 8 or 0 */ @@ -2326,6 +2320,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; + remaining_bits_len -= 8; } } } @@ -2444,8 +2439,6 @@ if (count > 0) { - remaining_bits_len -= count * 8; - if (remaining_bits_len < 0) { return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); @@ -2459,6 +2452,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += 8; + remaining_bits_len -= 8; count--; } } @@ -2491,7 +2485,6 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; - remaining_bits_len -= no_of_bits; ElementCount--; if (remaining_bits_len < 0) @@ -2500,6 +2493,7 @@ } bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; } bitvec_write_field(vector, &writeIndex, !Tag, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 Gerrit-Change-Number: 16996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:57 +0000 Subject: Change in osmo-pcu[master]: csn1: Extend CSN_SERIALIZE to allow 0 bit of length References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16997 ) Change subject: csn1: Extend CSN_SERIALIZE to allow 0 bit of length ...................................................................... csn1: Extend CSN_SERIALIZE to allow 0 bit of length Port of wireshark.git 2f024256bf337400ef3a82fa75e6d48d5707e059. >From c6ee558d3bb00bfd25cca7c534448bf60df3c7cf Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 4 Feb 2012 10:24:01 +0100 Subject: [PATCH 6/6] packet-csn: Extend CSN_SERIALIZE to allow 0 bit of length In some coding there is no 'length' field at the top of a serialized block, or it's more complex than a single field, in which case we have to rely on the serialize decoder to consume the correct number of bits. We extend the CSN_SERIALIZE processing so that if a '0 bit' length field is specified, then the length is not displayed and the consumed bits by the serialize function is taken as the length at posteriori. The processing keeps the same behavior for any length > 0. Change-Id: I9fadc99218594447001f7bb9943f4514b9877799 --- M src/csn1.cpp 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/16997/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 20b6c6f..02b9518 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -548,15 +548,20 @@ bit_offset += length_len; remaining_bits_len -= length_len; - csnStreamInit(&arT, bit_offset, length); + csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); arT.direction = 1; LOGPC(DCSN1, LOGL_NOTICE, "ptr = %p | offset = %d | ", (void *)data, (int)pDescr->offset); Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); if (Status >= 0) { - remaining_bits_len -= length; - bit_offset += length; + if (length > 0) { + remaining_bits_len -= length; + bit_offset += length; + } else { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } pDescr++; } else -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fadc99218594447001f7bb9943f4514b9877799 Gerrit-Change-Number: 16997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:57 +0000 Subject: Change in osmo-pcu[master]: csn1: Allow CHOICE elements to re-process the bits used for the choice References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16998 ) Change subject: csn1: Allow CHOICE elements to re-process the bits used for the choice ...................................................................... csn1: Allow CHOICE elements to re-process the bits used for the choice This is a port of wireshark.git commit 2f024256bf337400ef3a82fa75e6d48d5707e059. >From 78516187d821b8d19d16987b1d6bc855ee7cbe10 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 4 Feb 2012 10:00:22 +0100 Subject: [PATCH 4/6] packet-csn1: Allow CHOICE elements to re-process the bits used for the choice We may want to display more detail, or the sub-element should be displayed with its headers or whatever ... Change-Id: I3a5a95d5f918b8f17a2400a6d0c4d855ecacea7e --- M src/csn1.cpp M src/csn1.h M src/gsm_rlcmac.cpp 3 files changed, 47 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/98/16998/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 02b9518..d9faa8c 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -507,8 +507,10 @@ pui8 = pui8DATA(data, pDescr->offset); *pui8 = i; LOGPC(DCSN1, LOGL_NOTICE, "Choice %s = %u | ", pDescr->sz , (unsigned)value); - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; + if (!pChoice->keep_bits) { + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); diff --git a/src/csn1.h b/src/csn1.h index 39e6625..e927076 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -212,6 +212,7 @@ { guint8 bits; guint8 value; + gboolean keep_bits; CSN_DESCR descr; } CSN_ChoiceElement_t; diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c1d3b97..ed7c745 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -387,9 +387,9 @@ static const CSN_ChoiceElement_t IA_EGPRS_Choice[] = { - {2, 0x00, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, - {2, 0x01, CSN_ERROR(IA_EGPRS_t, "01 ", CSN_ERROR_STREAM_NOT_SUPPORTED)}, - {1, 0x01, CSN_ERROR(IA_EGPRS_t, "1 ", CSN_ERROR_STREAM_NOT_SUPPORTED)} + {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, + {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 ", CSN_ERROR_STREAM_NOT_SUPPORTED)}, + {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 ", CSN_ERROR_STREAM_NOT_SUPPORTED)} }; /* Please observe the double usage of UnionType element. @@ -526,10 +526,10 @@ static const CSN_ChoiceElement_t PacketPollingID[] = { - {1, 0, M_TYPE(PacketPollingID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketPollingID_t, u.TLLI, 32)}, - {3, 0x06, M_UINT(PacketPollingID_t, u.TQI, 16)}, -/*{3, 0x07 , M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)},*/ + {1, 0, 0, M_TYPE(PacketPollingID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketPollingID_t, u.TLLI, 32)}, + {3, 0x06, 0, M_UINT(PacketPollingID_t, u.TQI, 16)}, +/*{3, 0x07 , 0, M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)},*/ }; static const @@ -605,9 +605,9 @@ static const CSN_ChoiceElement_t SI13_PBCCH_Description_Channel[] = {/* this one is used in SI13*/ - {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ - {2, 0x01 , M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, - {1, 0x01 , M_UINT(PBCCH_Description_t, u.MAIO, 6)}, + {2, 0x00, 0, M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ + {2, 0x01, 0, M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, + {1, 0x01, 0, M_UINT(PBCCH_Description_t, u.MAIO, 6)}, }; static const @@ -895,12 +895,12 @@ static const CSN_ChoiceElement_t MS_RA_capability_value_Choice[] = { - {4, AccTech_GSMP, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSME, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1800, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1900, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM850, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMOther, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ + {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ }; static const @@ -928,12 +928,12 @@ static const CSN_ChoiceElement_t MultibandChoice[] = { - {3, 0x00, M_UINT(Multiband_t, u.A5_Bits, 4)}, - {3, 0x05, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x06, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x01, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x02, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x04, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)}, + {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, }; static const @@ -1053,8 +1053,8 @@ static const CSN_ChoiceElement_t PacketResourceRequestID[] = { - {1, 0, M_TYPE(PacketResourceRequestID_t, u.Global_TFI, Global_TFI_t)}, - {1, 0x01, M_UINT(PacketResourceRequestID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketResourceRequestID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x01, 0, M_UINT(PacketResourceRequestID_t, u.TLLI, 32)}, }; static const @@ -1732,10 +1732,10 @@ static const CSN_ChoiceElement_t PacketUplinkID[] = { - {1, 0 , M_TYPE(PacketUplinkID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02 , M_UINT(PacketUplinkID_t, u.TLLI, 32)}, - {3, 0x06 , M_UINT(PacketUplinkID_t, u.TQI, 16)}, - {3, 0x07 , M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {1, 0, 0, M_TYPE(PacketUplinkID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketUplinkID_t, u.TLLI, 32)}, + {3, 0x06, 0, M_UINT(PacketUplinkID_t, u.TQI, 16)}, + {3, 0x07, 0, M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, }; static const @@ -1866,8 +1866,8 @@ static const CSN_ChoiceElement_t PacketDownlinkID[] = { - {1, 0, M_TYPE(PacketDownlinkID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketDownlinkID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketDownlinkID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketDownlinkID_t, u.TLLI, 32)}, }; static const @@ -2106,9 +2106,9 @@ static const CSN_ChoiceElement_t PacketPowerControlTimingAdvanceID[] = { - {1, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Global_TFI, Global_TFI_t)}, - {3, 0x06, M_UINT(PacketPowerControlTimingAdvanceID_t, u.TQI, 16)}, - {3, 0x07, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {1, 0, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Global_TFI, Global_TFI_t)}, + {3, 0x06, 0, M_UINT(PacketPowerControlTimingAdvanceID_t, u.TQI, 16)}, + {3, 0x07, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, }; static const @@ -2388,9 +2388,9 @@ static const CSN_ChoiceElement_t RejectID[] = { - {1, 0x00, M_UINT(RejectID_t, u.TLLI, 32)}, - {2, 0x02, M_TYPE(RejectID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, - {2, 0x03, M_TYPE(RejectID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x00, 0, M_UINT(RejectID_t, u.TLLI, 32)}, + {2, 0x02, 0, M_TYPE(RejectID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {2, 0x03, 0, M_TYPE(RejectID_t, u.Global_TFI, Global_TFI_t)}, }; static const @@ -2421,8 +2421,8 @@ static const CSN_ChoiceElement_t PacketCellChangeOrderID[] = { - {1, 0, M_TYPE(PacketCellChangeOrderID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketCellChangeOrderID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketCellChangeOrderID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketCellChangeOrderID_t, u.TLLI, 32)}, }; /* PacketCellChangeOrderID_t; */ @@ -3819,8 +3819,8 @@ static const CSN_ChoiceElement_t PNCDContainer[] = { - {1, 0x0, M_TYPE(PNCDContainer_t, u.PNCD_Container_Without_ID, PNCD_Container_Without_ID_t)}, - {1, 0x1, M_TYPE(PNCDContainer_t, u.PNCD_Container_With_ID, PNCD_Container_With_ID_t)}, + {1, 0x0, 0, M_TYPE(PNCDContainer_t, u.PNCD_Container_Without_ID, PNCD_Container_Without_ID_t)}, + {1, 0x1, 0, M_TYPE(PNCDContainer_t, u.PNCD_Container_With_ID, PNCD_Container_With_ID_t)}, }; static const @@ -4124,8 +4124,8 @@ static const CSN_ChoiceElement_t AdditionalMsRadAccessCapID[] = { - {1, 0, M_TYPE(AdditionalMsRadAccessCapID_t, u.Global_TFI, Global_TFI_t)}, - {1, 0x01, M_UINT(AdditionalMsRadAccessCapID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(AdditionalMsRadAccessCapID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x01, 0, M_UINT(AdditionalMsRadAccessCapID_t, u.TLLI, 32)}, }; static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3a5a95d5f918b8f17a2400a6d0c4d855ecacea7e Gerrit-Change-Number: 16998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:58 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix pedantic compiler warnings in csn.1 dissectors References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16999 ) Change subject: csn1: Fix pedantic compiler warnings in csn.1 dissectors ...................................................................... csn1: Fix pedantic compiler warnings in csn.1 dissectors Port of wireshark.git commit 6aca10831f86c562970b13efa811f46e25ee3091. From Mike Morrin: Fix pedantic compiler warnings in csn.1 dissectors. There is some tricky casting going on in csn.1 structures. To eliminate all the warnings, the function pointers needed to be moved out of the object pointer unions. Fortunately macros (mostly) hide these changes from the protocol dissector tables. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 svn path=/trunk/; revision=44899 Change-Id: Ia1a8c50c4b024ca6df4e3fbbf891cd33591ccc9b --- M src/csn1.cpp M src/csn1.h 2 files changed, 58 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/99/16999/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index d9faa8c..310b9f9 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -335,7 +335,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -382,7 +382,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -539,7 +539,7 @@ case CSN_SERIALIZE: { - StreamSerializeFcn_t serialize = pDescr->serialize.fcn; + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; csnStream_t arT = *ar; guint8 length_len = pDescr->i; gint16 Status = -1; @@ -762,7 +762,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -821,7 +821,7 @@ gint16 Status; csnStream_t arT = *ar; guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->serialize.value; + guint16 nSize = (guint16)(guint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); @@ -1264,7 +1264,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); @@ -1327,7 +1327,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; csnStream_t arT = *ar; gboolean EndOfList = FALSE; @@ -1608,7 +1608,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -1655,7 +1655,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -1801,7 +1801,7 @@ case CSN_SERIALIZE: { - StreamSerializeFcn_t serialize = pDescr->serialize.fcn; + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; csnStream_t arT = *ar; guint8 length_len = pDescr->i; gint16 Status = -1; @@ -2025,7 +2025,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -2072,7 +2072,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2517,7 +2517,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); /* Store the counted number of elements of the array */ @@ -2579,7 +2579,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; guint8 ElementNum = 0; csnStream_t arT = *ar; diff --git a/src/csn1.h b/src/csn1.h index e927076..c5ee919 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -77,6 +77,7 @@ #ifndef ElementsOf #define ElementsOf(array) (sizeof(array) / sizeof(array[0])) #endif +typedef void(*void_fn_t)(void); /* Context holding CSN1 parameters */ typedef struct @@ -194,7 +195,7 @@ gint16 i; union { - void* ptr; + const void* ptr; guint32 value; } descr; unsigned offset; @@ -202,10 +203,11 @@ const char* sz; union { - StreamSerializeFcn_t fcn; + void * dummy; /* to eliminate --pedantic compiler warnings */ guint32 value; int* hf_ptr; - } serialize; + } format_p; + void_fn_t aux_fn; } CSN_DESCR; typedef struct @@ -244,7 +246,7 @@ CSN_DESCR CSNDESCR_##_STRUCT[] = { #define CSN_DESCR_END(_STRUCT)\ - {CSN_END, 0, {0}, 0, FALSE, "", {(StreamSerializeFcn_t)0}} }; + {CSN_END, 0, {0}, 0, FALSE, "", {NULL}, NULL} }; /****************************************************************************** * CSN_ERROR(Par1, Par2, Par3) @@ -255,7 +257,7 @@ * Par3: Error code *****************************************************************************/ #define CSN_ERROR(_STRUCT, _Text, _ERRCODE)\ - {CSN_TRAP_ERROR, _ERRCODE, {(void*)_Text}, 0, FALSE, _Text, {(StreamSerializeFcn_t)0}} + {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, {NULL}, NULL} /****************************************************************************** * M_BIT(Par1, Par2) @@ -264,7 +266,7 @@ * Par2: C structure element name *****************************************************************************/ #define M_BIT(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_BIT_OR_NULL(Par1, Par2) @@ -274,11 +276,11 @@ * Covers the case {null | 0 | 1} *****************************************************************************/ #define M_BIT_OR_NULL(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST(Par1, Par2, Par3) - * Indicates whether the next element or a group of elements defined in the + * Indicates whether the next element or a group of elements defined in the * structure is present or not. * Par1: C structure name * Par2: C structure element name @@ -286,7 +288,7 @@ * element(s) does not exist *****************************************************************************/ #define M_NEXT_EXIST(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_LH(Par1, Par2, Par3) @@ -296,7 +298,7 @@ * pattern 0x2B is performed on the read bit before the decision is made. *****************************************************************************/ #define M_NEXT_EXIST_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL(Par1, Par2, Par3) @@ -306,7 +308,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL_LH(Par1, Par2, Par3) @@ -316,7 +318,7 @@ * Covers the case {null | L | H < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -326,7 +328,7 @@ * Par3: number of bits used to code the element (between 1 and 32) *****************************************************************************/ #define M_UINT(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {(void*)1}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_OR_NULL(Par1, Par2, Par3) @@ -336,7 +338,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_UINT_OR_NULL(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -346,7 +348,7 @@ * received CSN.1 message *****************************************************************************/ #define M_UINT_LH(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT_LH, _BITS, {(void*)1}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_OFFSET(Par1, Par2, Par3, Par4) @@ -357,7 +359,7 @@ * Par4: value added to the returned integer (offset) *****************************************************************************/ #define M_UINT_OFFSET(_STRUCT, _MEMBER, _BITS, _OFFSET)\ - {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -368,7 +370,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCount)\ - {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -380,7 +382,7 @@ * structure member holding the length value *****************************************************************************/ #define M_VAR_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCountField)\ - {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)1}} + {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)1}, NULL} /****************************************************************************** * M_VAR_ARRAY(Par1, Par2, Par3, Par4) @@ -391,7 +393,7 @@ * Par4: offset that is added to the Par3 to get the actual size of the array *****************************************************************************/ #define M_VAR_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TARRAY(Par1, Par2, Par3, Par4) @@ -402,14 +404,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -427,7 +429,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -438,7 +440,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -450,7 +452,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -458,7 +460,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -466,7 +468,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) @@ -477,7 +479,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UNION(Par1, Par2) @@ -490,14 +492,14 @@ * Par2: number of possible choice in the union *****************************************************************************/ #define M_UNION(_STRUCT, _COUNT)\ - {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {(StreamSerializeFcn_t)0}} + {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} /****************************************************************************** * M_UNION_LH(Par1, Par2) * Same as M_UNION but masked with background value 0x2B *****************************************************************************/ #define M_UNION_LH(_STRUCT, _COUNT)\ - {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {(StreamSerializeFcn_t)0}} + {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} /****************************************************************************** * M_CHOICE(Par1, Par2, Par3, Par4) @@ -526,7 +528,7 @@ * Par4: number of possible choices in the union *****************************************************************************/ #define M_CHOICE(_STRUCT, _MEMBER, _CHOICE, _ElementCount)\ - {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {(StreamSerializeFcn_t)0}} + {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {NULL}, NULL} /****************************************************************************** * M_FIXED(Par1, Par2, Par3) @@ -538,7 +540,7 @@ * the message the unpacking procedure is aborted *****************************************************************************/ #define M_FIXED(_STRUCT, _BITS, _BITVALUE)\ - {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {(StreamSerializeFcn_t)0}} + {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {NULL}, NULL} /****************************************************************************** * M_SERIALIZE(Par1, Par2, Par3) @@ -551,10 +553,10 @@ * back control over the data stream and continues to work with the message. *****************************************************************************/ #define M_SERIALIZE(_STRUCT, _MEMBER, _LENGTH_LEN, _SERIALIZEFCN)\ - {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {_SERIALIZEFCN}} + {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, (void_fn_t)_SERIALIZEFCN} #define M_CALLBACK(_STRUCT, _CSNCALLBACKFCN, _PARAM1, _PARAM2)\ - {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {_CSNCALLBACKFCN}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {(StreamSerializeFcn_t)0}} + {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {NULL}, (void_fn_t)_CSNCALLBACKFCN} /****************************************************************************** * M_BITMAP(Par1, Par2, Par3) @@ -565,42 +567,42 @@ * Par3: length of the bitmap expressed in bits *****************************************************************************/ #define M_BITMAP(_STRUCT, _MEMBER, _BITS)\ - {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, right aligned bitmap i.e. _ElementCountField = 11 => 00000111 11111111 */ #define M_VAR_BITMAP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, right aligned bitmap filling the rest of message * - when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_VAR_BITMAP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, left aligned bitmap i.e. _ElementCountField = 11 => 11111111 11100000 */ #define M_LEFT_VAR_BMP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, left aligned bitmap filling the rest of message *- when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_LEFT_VAR_BMP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* todo: dissect padding bits looking for unexpected extensions */ #define M_PADDING_BITS(_STRUCT)\ - {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {(StreamSerializeFcn_t)0}} + {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {NULL}, NULL} #define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ - {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} #define M_THIS_EXIST(_STRUCT)\ - {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} + {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} #define M_THIS_EXIST_LH(_STRUCT)\ - {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} + {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} /* return value 0 if ok else discontionue the unpacking */ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia1a8c50c4b024ca6df4e3fbbf891cd33591ccc9b Gerrit-Change-Number: 16999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:36:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:36:59 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix an infinite loop in CSN.1 dissector when having more than 2... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17000 ) Change subject: csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits ...................................................................... csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits Port of wireshark.git 8b5aa913711b32b1e1bc707919d2a98c1875d443. Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 --- M src/csn1.cpp M src/csn1.h 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/17000/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 310b9f9..90daee9 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1150,7 +1150,7 @@ { while (remaining_bits_len > 0) { - guint8 bits_to_handle = remaining_bits_len%8; + guint bits_to_handle = remaining_bits_len%8; if (bits_to_handle > 0) { LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, &readIndex, bits_to_handle)); diff --git a/src/csn1.h b/src/csn1.h index c5ee919..0da529c 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -56,6 +56,7 @@ typedef signed int gint32; typedef signed short gint16; typedef int gint; +typedef unsigned int guint; typedef gint gboolean; typedef unsigned char guint8; typedef unsigned short guint16; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 Gerrit-Change-Number: 17000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:37:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:37:00 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix warning with -Wmissing-prototypes References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17001 ) Change subject: csn1: Fix warning with -Wmissing-prototypes ...................................................................... csn1: Fix warning with -Wmissing-prototypes Port of wireshark.git 2e52e2ac997ca58caabee3270b5a6c3f96159ff0. Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/17001/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 90daee9..67ea8a7 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1762,7 +1762,7 @@ { //gint16 count = pDescr->i; guint8 i = 0; - CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; + const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; pui8 = pui8DATA(data, pDescr->offset); i = *pui8; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 Gerrit-Change-Number: 17001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:37:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:37:01 +0000 Subject: Change in osmo-pcu[master]: csn1: Don't cast away constness References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17002 ) Change subject: csn1: Don't cast away constness ...................................................................... csn1: Don't cast away constness Port of wireshark.git commit 8e22ded7f8537e37e89ba558c83702d127443ae8. Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 --- M src/csn1.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/17002/1 diff --git a/src/csn1.h b/src/csn1.h index 0da529c..19b44ae 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -480,7 +480,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UNION(Par1, Par2) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 Gerrit-Change-Number: 17002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:37:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:37:02 +0000 Subject: Change in osmo-pcu[master]: csn1: Try to fix cast discards '__attribute__((const))' qualifier fro... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17003 ) Change subject: csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type ...................................................................... csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type Port of wireshark.git 1ff6213c949b373bcb7de5c48a5a4f805093066f. Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 --- M src/csn1.h 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/03/17003/1 diff --git a/src/csn1.h b/src/csn1.h index 19b44ae..bf910bd 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -405,14 +405,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -430,7 +430,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -441,7 +441,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -453,7 +453,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -461,7 +461,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -469,7 +469,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 Gerrit-Change-Number: 17003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:37:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:37:03 +0000 Subject: Change in osmo-pcu[master]: csn1: Drop format_p union from CSN_DESCR References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17004 ) Change subject: csn1: Drop format_p union from CSN_DESCR ...................................................................... csn1: Drop format_p union from CSN_DESCR Port of wireshark.git 8626bb4cbb4d9926f7b56663585d9ef66252f93f. We don't really need the other fields added there, let's keep only the value out of the union. Change-Id: Ia8889252ee7518a919a15d749815c2803b4b23cd --- M src/csn1.cpp M src/csn1.h 2 files changed, 51 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/04/17004/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 67ea8a7..64a7c64 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -335,7 +335,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -382,7 +382,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -762,7 +762,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -821,7 +821,7 @@ gint16 Status; csnStream_t arT = *ar; guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->format_p.value; + guint16 nSize = (guint16)(guint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); @@ -1264,7 +1264,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); @@ -1327,7 +1327,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; csnStream_t arT = *ar; gboolean EndOfList = FALSE; @@ -1608,7 +1608,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -1655,7 +1655,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2025,7 +2025,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -2072,7 +2072,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2517,7 +2517,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); /* Store the counted number of elements of the array */ @@ -2579,7 +2579,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; guint8 ElementNum = 0; csnStream_t arT = *ar; diff --git a/src/csn1.h b/src/csn1.h index bf910bd..f445dd2 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -202,12 +202,7 @@ unsigned offset; gboolean may_be_null; const char* sz; - union - { - void * dummy; /* to eliminate --pedantic compiler warnings */ - guint32 value; - int* hf_ptr; - } format_p; + guint32 value; void_fn_t aux_fn; } CSN_DESCR; @@ -247,7 +242,7 @@ CSN_DESCR CSNDESCR_##_STRUCT[] = { #define CSN_DESCR_END(_STRUCT)\ - {CSN_END, 0, {0}, 0, FALSE, "", {NULL}, NULL} }; + {CSN_END, 0, {0}, 0, FALSE, "", 0, NULL} }; /****************************************************************************** * CSN_ERROR(Par1, Par2, Par3) @@ -258,7 +253,7 @@ * Par3: Error code *****************************************************************************/ #define CSN_ERROR(_STRUCT, _Text, _ERRCODE)\ - {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, {NULL}, NULL} + {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, 0, NULL} /****************************************************************************** * M_BIT(Par1, Par2) @@ -267,7 +262,7 @@ * Par2: C structure element name *****************************************************************************/ #define M_BIT(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_BIT_OR_NULL(Par1, Par2) @@ -277,7 +272,7 @@ * Covers the case {null | 0 | 1} *****************************************************************************/ #define M_BIT_OR_NULL(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST(Par1, Par2, Par3) @@ -289,7 +284,7 @@ * element(s) does not exist *****************************************************************************/ #define M_NEXT_EXIST(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_LH(Par1, Par2, Par3) @@ -299,7 +294,7 @@ * pattern 0x2B is performed on the read bit before the decision is made. *****************************************************************************/ #define M_NEXT_EXIST_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL(Par1, Par2, Par3) @@ -309,7 +304,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL_LH(Par1, Par2, Par3) @@ -319,7 +314,7 @@ * Covers the case {null | L | H < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -329,7 +324,7 @@ * Par3: number of bits used to code the element (between 1 and 32) *****************************************************************************/ #define M_UINT(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_OR_NULL(Par1, Par2, Par3) @@ -339,7 +334,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_UINT_OR_NULL(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -349,7 +344,7 @@ * received CSN.1 message *****************************************************************************/ #define M_UINT_LH(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_OFFSET(Par1, Par2, Par3, Par4) @@ -360,7 +355,7 @@ * Par4: value added to the returned integer (offset) *****************************************************************************/ #define M_UINT_OFFSET(_STRUCT, _MEMBER, _BITS, _OFFSET)\ - {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -371,7 +366,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCount)\ - {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -383,7 +378,7 @@ * structure member holding the length value *****************************************************************************/ #define M_VAR_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCountField)\ - {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)1}, NULL} + {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 1, NULL} /****************************************************************************** * M_VAR_ARRAY(Par1, Par2, Par3, Par4) @@ -394,7 +389,7 @@ * Par4: offset that is added to the Par3 to get the actual size of the array *****************************************************************************/ #define M_VAR_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_TARRAY(Par1, Par2, Par3, Par4) @@ -405,14 +400,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -430,7 +425,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -441,7 +436,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -453,7 +448,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -461,7 +456,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -469,7 +464,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) @@ -480,7 +475,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UNION(Par1, Par2) @@ -493,14 +488,14 @@ * Par2: number of possible choice in the union *****************************************************************************/ #define M_UNION(_STRUCT, _COUNT)\ - {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} + {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", 0, NULL} /****************************************************************************** * M_UNION_LH(Par1, Par2) * Same as M_UNION but masked with background value 0x2B *****************************************************************************/ #define M_UNION_LH(_STRUCT, _COUNT)\ - {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} + {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", 0, NULL} /****************************************************************************** * M_CHOICE(Par1, Par2, Par3, Par4) @@ -529,7 +524,7 @@ * Par4: number of possible choices in the union *****************************************************************************/ #define M_CHOICE(_STRUCT, _MEMBER, _CHOICE, _ElementCount)\ - {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {NULL}, NULL} + {CSN_CHOICE, _ElementCount, {(const void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, 0, NULL} /****************************************************************************** * M_FIXED(Par1, Par2, Par3) @@ -541,7 +536,7 @@ * the message the unpacking procedure is aborted *****************************************************************************/ #define M_FIXED(_STRUCT, _BITS, _BITVALUE)\ - {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {NULL}, NULL} + {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, 0, NULL} /****************************************************************************** * M_SERIALIZE(Par1, Par2, Par3) @@ -554,10 +549,10 @@ * back control over the data stream and continues to work with the message. *****************************************************************************/ #define M_SERIALIZE(_STRUCT, _MEMBER, _LENGTH_LEN, _SERIALIZEFCN)\ - {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, (void_fn_t)_SERIALIZEFCN} + {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, (void_fn_t)_SERIALIZEFCN} #define M_CALLBACK(_STRUCT, _CSNCALLBACKFCN, _PARAM1, _PARAM2)\ - {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {NULL}, (void_fn_t)_CSNCALLBACKFCN} + {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, 0, (void_fn_t)_CSNCALLBACKFCN} /****************************************************************************** * M_BITMAP(Par1, Par2, Par3) @@ -568,42 +563,42 @@ * Par3: length of the bitmap expressed in bits *****************************************************************************/ #define M_BITMAP(_STRUCT, _MEMBER, _BITS)\ - {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, right aligned bitmap i.e. _ElementCountField = 11 => 00000111 11111111 */ #define M_VAR_BITMAP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, right aligned bitmap filling the rest of message * - when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_VAR_BITMAP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, left aligned bitmap i.e. _ElementCountField = 11 => 11111111 11100000 */ #define M_LEFT_VAR_BMP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, left aligned bitmap filling the rest of message *- when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_LEFT_VAR_BMP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* todo: dissect padding bits looking for unexpected extensions */ #define M_PADDING_BITS(_STRUCT)\ - {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {NULL}, NULL} + {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", 0, NULL} #define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ - {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} #define M_THIS_EXIST(_STRUCT)\ - {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} + {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", 0, NULL} #define M_THIS_EXIST_LH(_STRUCT)\ - {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} + {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", 0, NULL} /* return value 0 if ok else discontionue the unpacking */ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8889252ee7518a919a15d749815c2803b4b23cd Gerrit-Change-Number: 17004 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:37:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 17:37:05 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 Port of wireshark.git commit fd68c7dfc7d06ce7babe914f2575d9e4f35988ad. Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd --- M src/csn1.cpp 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/17005/1 diff --git a/src/csn1.cpp b/src/csn1.cpp index 64a7c64..b27d05e 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1042,7 +1042,7 @@ /*no break - * with a length set we have a regular variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_VARIABLE_BITMAP: { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -1098,7 +1098,7 @@ * with a length set we have a regular left aligned variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_LEFT_ALIGNED_VAR_BMP: { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -1321,7 +1321,7 @@ * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue */ } - + /* FALL THROUGH */ case CSN_RECURSIVE_TARRAY_1: { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) @@ -2287,7 +2287,7 @@ /*no break - * with a length set we have a regular variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_VARIABLE_BITMAP: { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -2344,7 +2344,7 @@ * with a length set we have a regular left aligned variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_LEFT_ALIGNED_VAR_BMP: { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -2573,7 +2573,7 @@ * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue */ } - + /* FALL THROUGH */ case CSN_RECURSIVE_TARRAY_1: { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:44:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:44:06 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16989 ) Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:44:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:44:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:44:46 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... Patch Set 2: Code-Review+2 LOL, and this compiles just fine... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:44:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:45:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:45:41 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... Patch Set 2: Ah, most likely because GCC concatenates these 4 strings into a single one. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:45:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:53:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:53:12 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16988/2/tests/rlcmac/RLCMACTest.cpp File tests/rlcmac/RLCMACTest.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16988/2/tests/rlcmac/RLCMACTest.cpp at 114 PS2, Line 114: vector1 This print looks redundant as we print another vector1 below. Can we drop it (probably, in the follow-up changes)? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:53:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:56:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:56:19 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Don't check stderr output In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16992 ) Change subject: tests/rlcmac: Don't check stderr output ...................................................................... Patch Set 2: Code-Review+1 I would expect some library (libosmogb?) to print ERROR / NOTICE messages to stderr... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 Gerrit-Change-Number: 16992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:56:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 17:59:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 17:59:10 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16993/2/tests/rlcmac/RLCMACTest.cpp File tests/rlcmac/RLCMACTest.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16993/2/tests/rlcmac/RLCMACTest.cpp at 236 PS2, Line 236: //assert (rc == 0); Could you please use #ifdef 0 ... #endif? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 17:59:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:00:21 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16994 ) Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 24 Jan 2020 18:00:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:01:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:01:22 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 7 PS1, Line 7: warning: 'pui8' may be used uninitialized in this function Hmmm, why don't we see this warning? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 18:01:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:02:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:02:36 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 7 PS1, Line 7: warning: 'pui8' may be used uninitialized in this function > Hmmm, why don't we see this warning? ... when building OsmoPCU I mean. Maybe because we compile with G++ and not with GCC? Is there anything C++ specific in this file BTW? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 18:02:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:05:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:05:41 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 1: -Code-Review (1 comment) Please indicate the actual author. https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 2 PS1, Line 2: Pau Espin Pedrol It's actually Anders Broman. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 18:05:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:10:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:10:04 +0000 Subject: Change in osmo-pcu[master]: csn1: shuffle decrements of remaining_bits_len In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16996 ) Change subject: csn1: shuffle decrements of remaining_bits_len ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16996/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16996/1//COMMIT_MSG at 2 PS1, Line 2: Pau Espin Pedrol The original commit states "From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6754". Committer is Jeff Morriss. https://gerrit.osmocom.org/c/osmo-pcu/+/16996/1/src/csn1.cpp File src/csn1.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16996/1/src/csn1.cpp at 1246 PS1, Line 1246: Coding style--. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 Gerrit-Change-Number: 16996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 24 Jan 2020 18:10:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:13:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 18:13:34 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1/src/csn1.cpp File src/csn1.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1/src/csn1.cpp at 1042 PS1, Line 1042: no break Isn't this enough for a compiler to guess that break is omitted intentionally? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 24 Jan 2020 18:13:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:37:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 18:37:46 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16988/2/tests/rlcmac/RLCMACTest.cpp File tests/rlcmac/RLCMACTest.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16988/2/tests/rlcmac/RLCMACTest.cpp at 114 PS2, Line 114: vector1 > This print looks redundant as we print another vector1 below. [?] I prefer keeping it to easily find out if for instance test crashes. Note that I change it to simply print the original string instead of printing hex values as before. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jan 2020 18:37:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 18:40:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jan 2020 18:40:00 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 7 PS1, Line 7: warning: 'pui8' may be used uninitialized in this function > ... when building OsmoPCU I mean. Maybe because we compile with G++ and not with GCC? [?] Probably because we use g++ instead of gcc yes. No idea if we have something c++. In any case, even if it's not needed I prefer keeping so when source file is compared against wireshark this line doesn't show up. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jan 2020 18:40:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 22:26:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 22:26:45 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... gsm_timer: fix comparison of constant LONG_MAX with an integer It does not make sense since INT_MAX is always less than LONG_MAX. Found by Clang [-Wtautological-constant-out-of-range-compare]. Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 --- M src/gsm_timer.cpp 1 file changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/17006/1 diff --git a/src/gsm_timer.cpp b/src/gsm_timer.cpp index f7901d4..cefe520 100644 --- a/src/gsm_timer.cpp +++ b/src/gsm_timer.cpp @@ -144,17 +144,14 @@ static void update_nearest(int *cand, int *current) { - if (*cand != LONG_MAX) { - if (*cand > *current) - nearest = *cand - *current; - else { - /* loop again inmediately */ - nearest = 0; - } - nearest_p = &nearest; - } else { - nearest_p = NULL; + if (*cand > *current) + nearest = *cand - *current; + else { + /* loop again inmediately */ + nearest = 0; } + + nearest_p = &nearest; } /* -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 22:26:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 22:26:45 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' The 'gprs_llc' is defined as a pure C structure with C++ specific extensions (methods), so it's rather a class. Accessing its field 'frame' statically causes Clang to throw a compilation error: gprs_bssgp_pcu.cpp:111:29: error: invalid use of non-static data member 'frame' if (len > sizeof(gprs_llc::frame)) Let's avoid this and use LLC_MAX_LEN as the size limitation. God knows what to expect from such a mix of C++ and C... Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/17007/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index f00fc94..080245a 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -108,7 +108,7 @@ data = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_LLC_PDU); len = TLVP_LEN(tp, BSSGP_IE_LLC_PDU); - if (len > sizeof(gprs_llc::frame)) + if (len > sizeof(LLC_MAX_LEN)) { LOGP(DBSSGP, LOGL_NOTICE, "BSSGP TLLI=0x%08x Rx UL-UD IE_LLC_PDU too large\n", tlli); return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 22:26:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 22:26:46 +0000 Subject: Change in osmo-pcu[master]: encoding: fix log_alert_exit(): do not treat error as format string References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17008 ) Change subject: encoding: fix log_alert_exit(): do not treat error as format string ...................................................................... encoding: fix log_alert_exit(): do not treat error as format string This is rather a cosmetic change aimed to make ASAN / Coverity happy. In general, we never pass any input from an untrusted source. Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 --- M src/encoding.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/17008/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 8c3aaed..23b35bd 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -432,7 +432,7 @@ static inline void log_alert_exit(const char * error) { - LOGP(DRLCMACUL, LOGL_ERROR, error); + LOGP(DRLCMACUL, LOGL_ERROR, "%s", error); pcu_tx_txt_ind(PCU_OML_ALERT, error); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 Gerrit-Change-Number: 17008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 22:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 22:26:47 +0000 Subject: Change in osmo-pcu[master]: tests/alloc: fix implicit conversion from 'double' to 'int8_t' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17009 ) Change subject: tests/alloc: fix implicit conversion from 'double' to 'int8_t' ...................................................................... tests/alloc: fix implicit conversion from 'double' to 'int8_t' Looks pretty much like a typo. Both '-1' and '.' symbols are neighbours in QWERTZ keyboard layout, so it must be -1. Found by Clang [-Wliteral-conversion]. Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b --- M tests/alloc/AllocTest.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/09/17009/1 diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 123f879..2fdee3f 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -309,7 +309,7 @@ tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0, false); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, false); if (!ul_tbf) return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b Gerrit-Change-Number: 17009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 24 22:26:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jan 2020 22:26:48 +0000 Subject: Change in osmo-pcu[master]: csn1: get rid of C++ specific code, compile with GCC References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17010 ) Change subject: csn1: get rid of C++ specific code, compile with GCC ...................................................................... csn1: get rid of C++ specific code, compile with GCC The implementation of CSN.1 codec was taken from Wireshark, where it's implemented in pure C. For some reason it was mixed with C++ specific features, mostly using references in parameter declaration. Not sure what are the benefits. Change-Id: I56d8b7fbd2f9f4e0bdd6b09d0366fe7eb7aa327a --- M src/Makefile.am R src/csn1.c M src/csn1.h M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp 6 files changed, 211 insertions(+), 213 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/17010/1 diff --git a/src/Makefile.am b/src/Makefile.am index a84a511..eb1e389 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ libgprs_la_SOURCES = \ gprs_debug.cpp \ - csn1.cpp \ + csn1.c \ gsm_rlcmac.cpp \ gprs_bssgp_pcu.cpp \ gprs_rlcmac.cpp \ diff --git a/src/csn1.cpp b/src/csn1.c similarity index 91% rename from src/csn1.cpp rename to src/csn1.c index 6203a44..88c4af3 100644 --- a/src/csn1.cpp +++ b/src/csn1.c @@ -28,8 +28,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include #include #include #define __STDC_FORMAT_MACROS @@ -47,33 +45,32 @@ #define STANDARD_TAG 1 #define REVERSED_TAG 0 -using namespace std; static const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5}; /* Returns no_of_bits (up to 8) masked with 0x2B */ static guint8 -get_masked_bits8( bitvec *vector, unsigned& readIndex, gint bit_offset, const gint no_of_bits) +get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits) { static const guint8 maskBits[] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF}; //gint byte_offset = bit_offset >> 3; /* divide by 8 */ gint relative_bit_offset = bit_offset & 0x07; /* modulo 8 */ guint8 result; gint bit_shift = 8 - relative_bit_offset - (gint) no_of_bits; - readIndex -= relative_bit_offset; + *readIndex -= relative_bit_offset; if (bit_shift >= 0) { - result = (0x2B ^ ((guint8)bitvec_read_field(vector, &readIndex, 8))) >> bit_shift; - readIndex-= bit_shift; + result = (0x2B ^ ((guint8)bitvec_read_field(vector, readIndex, 8))) >> bit_shift; + *readIndex-= bit_shift; result &= maskBits[no_of_bits]; } else { - guint8 hight_part = (0x2B ^ ((guint8)bitvec_read_field(vector, &readIndex, 8))) & maskBits[8 - relative_bit_offset]; + guint8 hight_part = (0x2B ^ ((guint8)bitvec_read_field(vector, readIndex, 8))) & maskBits[8 - relative_bit_offset]; hight_part = (guint8) (hight_part << (-bit_shift)); - result = (0x2B ^ ((guint8)bitvec_read_field(vector, &readIndex, 8))) >> (8 + bit_shift); - readIndex = readIndex - (8 - (-bit_shift)); + result = (0x2B ^ ((guint8)bitvec_read_field(vector, readIndex, 8))) >> (8 + bit_shift); + *readIndex = *readIndex - (8 - (-bit_shift)); result |= hight_part; } return result; @@ -107,7 +104,7 @@ }; static gint16 -ProcessError( unsigned readIndex, const char* sz, gint16 err, const CSN_DESCR* pDescr) +ProcessError( unsigned *readIndex, const char* sz, gint16 err, const CSN_DESCR* pDescr) { gint16 i = MIN(-err, ((gint16) ElementsOf(ErrCodes)-1)); if (i >= 0) @@ -131,9 +128,9 @@ */ static gboolean -existNextElement(bitvec *vector, unsigned& readIndex, guint8 Tag) +existNextElement(struct bitvec *vector, unsigned *readIndex, guint8 Tag) { - guint8 res = bitvec_read_field(vector, &readIndex, 1); + guint8 res = bitvec_read_field(vector, readIndex, 1); if (Tag == STANDARD_TAG) { return (res > 0); @@ -143,7 +140,7 @@ gint16 -csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, bitvec *vector, unsigned& readIndex, void* data) +csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data) { gint remaining_bits_len = ar->remaining_bits_len; gint bit_offset = ar->bit_offset; @@ -152,6 +149,7 @@ guint32* pui32; guint64* pui64; guint8 Tag = STANDARD_TAG; + unsigned ib; if (remaining_bits_len <= 0) { @@ -167,7 +165,7 @@ if (remaining_bits_len > 0) { pui8 = pui8DATA(data, pDescr->offset); - *pui8 = bitvec_read_field(vector, &readIndex, 1); + *pui8 = bitvec_read_field(vector, readIndex, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); /* end add the bit value to protocol tree */ } @@ -202,21 +200,21 @@ { if (no_of_bits <= 8) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { - guint16 ui16 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { - guint32 ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32; LOGPC(DCSN1, LOGL_NOTICE, "%s = 0x%08x | ", pDescr->sz , *pui32); @@ -264,21 +262,21 @@ { if (no_of_bits <= 8) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8 + (guint8)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { - guint16 ui16 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16 + (guint16)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { - guint32 ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32 + (guint16)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); @@ -347,7 +345,7 @@ pui8 = pui8DATA(data, pDescr->offset); do { - *pui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += no_of_bits; @@ -428,9 +426,9 @@ if (no_of_bits <= 32) { - for(unsigned ib = 0; ib < 4; ib++) + for(ib = 0; ib < 4; ib++) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, 8); + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); pui8 = pui8DATA(data, pDescr->offset+ib); *pui8 = ui8; LOGPC(DCSN1, LOGL_NOTICE, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); @@ -438,9 +436,9 @@ } else if (no_of_bits <= 64) { - for(unsigned ib = 0; ib < 8; ib++) + for(ib = 0; ib < 8; ib++) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, 8); + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); pui8 = pui8DATA(data, pDescr->offset+ib); *pui8 = ui8; LOGPC(DCSN1, LOGL_NOTICE, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); @@ -493,7 +491,7 @@ while (count > 0) { guint8 no_of_bits = pChoice->bits; - guint8 value = bitvec_read_field(vector, &readIndex, no_of_bits); + guint8 value = bitvec_read_field(vector, readIndex, no_of_bits); if (value == pChoice->value) { CSN_DESCR descr[2]; @@ -524,7 +522,7 @@ break; } - readIndex -= no_of_bits; + *readIndex -= no_of_bits; count--; pChoice++; i++; @@ -541,7 +539,7 @@ guint8 length_len = pDescr->i; gint16 Status = -1; - guint8 length = bitvec_read_field(vector, &readIndex, length_len); + guint8 length = bitvec_read_field(vector, readIndex, length_len); LOGPC(DCSN1, LOGL_NOTICE, "%s length = %d | ", pDescr->sz , (int)length); bit_offset += length_len; @@ -591,11 +589,11 @@ if (CSN_UNION_LH == pDescr->type) { - index |= get_masked_bits8(vector,readIndex, bit_offset, 1); + index |= get_masked_bits8(vector, readIndex, bit_offset, 1); } else { - index |= bitvec_read_field(vector, &readIndex, 1); + index |= bitvec_read_field(vector, readIndex, 1); } remaining_bits_len--; bit_offset++; @@ -618,7 +616,7 @@ { pui8 = pui8DATA(data, pDescr->offset); *pui8 = 0x00; - if (bitvec_read_field(vector, &readIndex, 1) > 0) + if (bitvec_read_field(vector, readIndex, 1) > 0) { *pui8 = 0x01; } @@ -644,21 +642,21 @@ if (no_of_bits <= 8) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { - guint16 ui16 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { - guint32 ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); @@ -686,21 +684,21 @@ { if (no_of_bits <= 8) { - guint8 ui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); pui8 = pui8DATA(data, pDescr->offset); *pui8 = ui8 + (guint8)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { - guint16 ui16 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); pui16 = pui16DATA(data, pDescr->offset); *pui16 = ui16 + (guint16)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { - guint32 ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32 + (guint16)pDescr->descr.value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); @@ -767,7 +765,7 @@ while (nCount > 0) { - *pui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += no_of_bits; @@ -780,7 +778,7 @@ while (nCount > 0) { - *pui16 = bitvec_read_field(vector, &readIndex, no_of_bits); + *pui16 = bitvec_read_field(vector, readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , *pui16); pui16++; bit_offset += no_of_bits; @@ -856,13 +854,13 @@ if (no_of_bits <= 32) { - guint32 ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); pui32 = pui32DATA(data, pDescr->offset); *pui32 = ui32; } else if (no_of_bits <= 64) { - guint64 ui64 = bitvec_read_field(vector, &readIndex, no_of_bits); + guint64 ui64 = bitvec_read_field(vector, readIndex, no_of_bits); pui64 = pui64DATA(data, pDescr->offset); *pui64 = ui64; LOGPC(DCSN1, LOGL_NOTICE, "%s = %lu | ", pDescr->sz , *pui64); @@ -927,7 +925,7 @@ } else { - fExist = bitvec_read_field(vector, &readIndex, 1); + fExist = bitvec_read_field(vector, readIndex, 1); } *pui8 = fExist; @@ -966,7 +964,7 @@ /* the "regular" M_NEXT_EXIST description element */ fExist = 0x00; - if (bitvec_read_field(vector, &readIndex, 1)) + if (bitvec_read_field(vector, readIndex, 1)) { fExist = 0x01; } @@ -1009,7 +1007,7 @@ } /* the "regular" M_NEXT_EXIST_LH description element */ - fExist = get_masked_bits8(vector,readIndex,bit_offset, 1); + fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)fExist); *pui8++ = fExist; remaining_bits_len -= 1; @@ -1059,7 +1057,7 @@ if (nB1 > 0) { /* take care of the first byte - it will be right aligned */ - *pui8 = bitvec_read_field(vector, &readIndex, nB1); + *pui8 = bitvec_read_field(vector, readIndex, nB1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= nB1; @@ -1069,7 +1067,7 @@ /* remaining no_of_bits is a multiple of 8 or 0 */ while (no_of_bits > 0) { - *pui8 = bitvec_read_field(vector, &readIndex, 8); + *pui8 = bitvec_read_field(vector, readIndex, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; @@ -1113,14 +1111,14 @@ while (no_of_bits >= 8) { - *pui8 = bitvec_read_field(vector, &readIndex, 8); + *pui8 = bitvec_read_field(vector, readIndex, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; } if (no_of_bits > 0) { - *pui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += no_of_bits; @@ -1144,13 +1142,13 @@ guint8 bits_to_handle = remaining_bits_len%8; if (bits_to_handle > 0) { - LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, &readIndex, bits_to_handle)); + LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, readIndex, bits_to_handle)); remaining_bits_len -= bits_to_handle; bit_offset += bits_to_handle; } else if (bits_to_handle == 0) { - LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, &readIndex, 8)); + LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, readIndex, 8)); remaining_bits_len -= 8; bit_offset += 8; } @@ -1191,7 +1189,7 @@ while (count > 0) { readIndex -= 8; - *pui8 = bitvec_read_field(vector, &readIndex, 8); + *pui8 = bitvec_read_field(vector, readIndex, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += 8; @@ -1224,7 +1222,7 @@ remaining_bits_len--; /* extract and store no_of_bits long element from bitstream */ - *pui8 = bitvec_read_field(vector, &readIndex, no_of_bits); + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; remaining_bits_len -= no_of_bits; @@ -1238,7 +1236,7 @@ bit_offset += no_of_bits; } - LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, &readIndex, 1)); + LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, readIndex, 1)); /* existNextElement() returned FALSE, 1 bit consumed */ bit_offset++; @@ -1290,7 +1288,7 @@ } } - LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, &readIndex, 1)); + LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, readIndex, 1)); /* existNextElement() returned FALSE, 1 bit consumed */ bit_offset++; @@ -1372,7 +1370,7 @@ if (no_of_bits <= 32) { - ui32 = bitvec_read_field(vector, &readIndex, no_of_bits); + ui32 = bitvec_read_field(vector, readIndex, no_of_bits); } else { @@ -1424,7 +1422,7 @@ -gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, bitvec *vector, unsigned& writeIndex, void* data) +gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data) { gint remaining_bits_len = ar->remaining_bits_len; gint bit_offset = ar->bit_offset; @@ -1432,6 +1430,7 @@ guint16* pui16; guint32* pui32; guint64* pui64; + unsigned ib; guint8 Tag = STANDARD_TAG; @@ -1449,7 +1448,7 @@ if (remaining_bits_len > 0) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, 1); + bitvec_write_field(vector, writeIndex, *pui8, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); /* end add the bit value to protocol tree */ } @@ -1483,19 +1482,19 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui16, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui32, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); } else @@ -1528,19 +1527,19 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); } else if (no_of_bits <= 16) { pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); } else if (no_of_bits <= 32) { pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); } else @@ -1569,12 +1568,12 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); // TODO : Change get_masked_bits8() - writeIndex -= no_of_bits; + *writeIndex -= no_of_bits; guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - writeIndex -= no_of_bits; - bitvec_write_field(vector, &writeIndex, ui8, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } @@ -1612,7 +1611,7 @@ pui8 = pui8DATA(data, pDescr->offset); do { - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += no_of_bits; @@ -1694,19 +1693,19 @@ if (no_of_bits <= 32) { - for(unsigned ib = 0; ib < 4; ib++) + for(ib = 0; ib < 4; ib++) { pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, &writeIndex, *pui8, 8); + bitvec_write_field(vector, writeIndex, *pui8, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); } } else if (no_of_bits <= 64) { - for(unsigned ib = 0; ib < 8; ib++) + for(ib = 0; ib < 8; ib++) { pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, &writeIndex, *pui8, 8); + bitvec_write_field(vector, writeIndex, *pui8, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); } } @@ -1761,7 +1760,7 @@ guint8 no_of_bits = pChoice->bits; guint8 value = pChoice->value; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pChoice->descr.sz , (unsigned)value); - bitvec_write_field(vector, &writeIndex, value, no_of_bits); + bitvec_write_field(vector, writeIndex, value, no_of_bits); CSN_DESCR descr[2]; gint16 Status; @@ -1799,16 +1798,16 @@ unsigned lengthIndex; // store writeIndex for length value (7 bit) - lengthIndex = writeIndex; - writeIndex += length_len; + lengthIndex = *writeIndex; + *writeIndex += length_len; bit_offset += length_len; remaining_bits_len -= length_len; arT.direction = 0; csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); - bitvec_write_field(vector, &lengthIndex, writeIndex-lengthIndex-length_len, length_len); - LOGPC(DCSN1, LOGL_NOTICE, "%s length = %u | ", pDescr->sz , (unsigned)(writeIndex-lengthIndex)); + bitvec_write_field(vector, &lengthIndex, *writeIndex - lengthIndex - length_len, length_len); + LOGPC(DCSN1, LOGL_NOTICE, "%s length = %u | ", pDescr->sz , (unsigned)(*writeIndex - lengthIndex)); if (Status >= 0) { @@ -1846,10 +1845,10 @@ /* Assign UnionType */ pui8 = pui8DATA(data, pDescr->offset); //read index from data and write to vector - bitvec_write_field(vector, &writeIndex, *pui8, Bits); + bitvec_write_field(vector, writeIndex, *pui8, Bits); //decode index - writeIndex -= Bits; + *writeIndex -= Bits; while (Bits > 0) { @@ -1857,11 +1856,11 @@ if (CSN_UNION_LH == pDescr->type) { - index |= get_masked_bits8(vector,writeIndex, bit_offset, 1); + index |= get_masked_bits8(vector, writeIndex, bit_offset, 1); } else { - index |= bitvec_read_field(vector, &writeIndex, 1); + index |= bitvec_read_field(vector, writeIndex, 1); } remaining_bits_len--; @@ -1869,8 +1868,8 @@ Bits--; } - writeIndex -= Bits; - bitvec_write_field(vector, &writeIndex, index, Bits); + *writeIndex -= Bits; + bitvec_write_field(vector, writeIndex, index, Bits); /* script index to continue on, limited in case we do not have a power of 2 */ @@ -1883,7 +1882,7 @@ case CSN_BIT: { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, 1); + bitvec_write_field(vector, writeIndex, *pui8, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); remaining_bits_len -= 1; bit_offset++; @@ -1907,19 +1906,19 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } else if (no_of_bits <= 16) { pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui16, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui16); } else if (no_of_bits <= 32) { pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui32, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); } else @@ -1946,19 +1945,19 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); } else if (no_of_bits <= 16) { pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); } else if (no_of_bits <= 32) { pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); } else @@ -1987,12 +1986,12 @@ if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); // TODO : Change get_masked_bits8() - writeIndex -= no_of_bits; + *writeIndex -= no_of_bits; guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - writeIndex -= no_of_bits; - bitvec_write_field(vector, &writeIndex, ui8, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); } @@ -2030,7 +2029,7 @@ pui8 = pui8DATA(data, pDescr->offset); do { - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += no_of_bits; @@ -2112,13 +2111,13 @@ if (no_of_bits <= 32) { pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui32, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %d | ", pDescr->sz , *pui32); } else if (no_of_bits <= 64) { pui64 = pui64DATA(data, pDescr->offset); - bitvec_write_field(vector, &writeIndex, *pui64, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui64, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %lu | ", pDescr->sz , *pui64); } else @@ -2176,7 +2175,7 @@ unsigned exist = 0; pui8 = pui8DATA(data, pDescr->offset); exist = *pui8; - bitvec_write_field(vector, &writeIndex, *pui8, 1); + bitvec_write_field(vector, writeIndex, *pui8, 1); writeIndex--; if (CSN_EXIST_LH == pDescr->type) { @@ -2184,10 +2183,10 @@ } else { - fExist = bitvec_read_field(vector, &writeIndex, 1); + fExist = bitvec_read_field(vector, writeIndex, 1); } writeIndex--; - bitvec_write_field(vector, &writeIndex, fExist, 1); + bitvec_write_field(vector, writeIndex, fExist, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz, (unsigned)fExist); pDescr++; remaining_bits_len -= 1; @@ -2217,7 +2216,7 @@ break; } - bitvec_write_field(vector, &writeIndex, *pui8, 1); + bitvec_write_field(vector, writeIndex, *pui8, 1); fExist = *pui8; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); remaining_bits_len -= 1; @@ -2257,11 +2256,11 @@ } /* the "regular" M_NEXT_EXIST_LH description element */ - bitvec_write_field(vector, &writeIndex, *pui8, 1); + bitvec_write_field(vector, writeIndex, *pui8, 1); writeIndex--; - fExist = get_masked_bits8(vector,writeIndex, bit_offset, 1); + fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); writeIndex--; - bitvec_write_field(vector, &writeIndex, fExist, 1); + bitvec_write_field(vector, writeIndex, fExist, 1); pui8++; remaining_bits_len -= 1; @@ -2310,7 +2309,7 @@ if (nB1 > 0) { /* take care of the first byte - it will be right aligned */ - bitvec_write_field(vector, &writeIndex, *pui8, nB1); + bitvec_write_field(vector, writeIndex, *pui8, nB1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= nB1; @@ -2320,7 +2319,7 @@ /* remaining no_of_bits is a multiple of 8 or 0 */ while (no_of_bits > 0) { - bitvec_write_field(vector, &writeIndex, *pui8, 8); + bitvec_write_field(vector, writeIndex, *pui8, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; @@ -2366,14 +2365,14 @@ while (no_of_bits > 0) { - bitvec_write_field(vector, &writeIndex, *pui8, 8); + bitvec_write_field(vector, writeIndex, *pui8, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; } if (nB1 > 0) { - bitvec_write_field(vector, &writeIndex, *pui8, nB1); + bitvec_write_field(vector, writeIndex, *pui8, nB1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= nB1; @@ -2405,14 +2404,14 @@ * < padding bits > ::= { null | 0 < spare padding > ! < Ignore : 1 bit** = < no string > > } ; */ guint8 fl = filler&(0xff>>(8-bits_to_handle + 1)); - bitvec_write_field(vector, &writeIndex, fl, bits_to_handle); + bitvec_write_field(vector, writeIndex, fl, bits_to_handle); LOGPC(DCSN1, LOGL_NOTICE, "%u|", fl); remaining_bits_len -= bits_to_handle; bit_offset += bits_to_handle; } else if (bits_to_handle == 0) { - bitvec_write_field(vector, &writeIndex, filler, 8); + bitvec_write_field(vector, writeIndex, filler, 8); LOGPC(DCSN1, LOGL_NOTICE, "%u|", filler); remaining_bits_len -= 8; bit_offset += 8; @@ -2453,7 +2452,7 @@ while (count > 0) { - bitvec_write_field(vector, &writeIndex, *pui8, 8); + bitvec_write_field(vector, writeIndex, *pui8, 8); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += 8; @@ -2480,13 +2479,13 @@ ElementCount = *pui8DATA(data, (gint16)pDescr->descr.value); while (ElementCount > 0) { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, &writeIndex, Tag, 1); + bitvec_write_field(vector, writeIndex, Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)Tag); bit_offset++; remaining_bits_len--; /* extract and store no_of_bits long element from bitstream */ - bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; remaining_bits_len -= no_of_bits; @@ -2500,7 +2499,7 @@ bit_offset += no_of_bits; } - bitvec_write_field(vector, &writeIndex, !Tag, 1); + bitvec_write_field(vector, writeIndex, !Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); bit_offset++; remaining_bits_len--; @@ -2522,7 +2521,7 @@ while (ElementCount > 0) { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, &writeIndex, Tag, 1); + bitvec_write_field(vector, writeIndex, Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)Tag); bit_offset++; @@ -2553,7 +2552,7 @@ } } - bitvec_write_field(vector, &writeIndex, !Tag, 1); + bitvec_write_field(vector, writeIndex, !Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); bit_offset++; @@ -2591,7 +2590,7 @@ { /* get data element */ if (ElementCount != ElementNum) { - bitvec_write_field(vector, &writeIndex, Tag, 1); + bitvec_write_field(vector, writeIndex, Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)Tag); bit_offset++; remaining_bits_len--; @@ -2618,7 +2617,7 @@ } } - bitvec_write_field(vector, &writeIndex, !Tag, 1); + bitvec_write_field(vector, writeIndex, !Tag, 1); bit_offset++; remaining_bits_len--; Tag = STANDARD_TAG; /* in case it was set to "reversed" */ @@ -2629,7 +2628,7 @@ case CSN_FIXED: { /* Verify the fixed bits */ guint8 no_of_bits = (guint8) pDescr->i; - bitvec_write_field(vector, &writeIndex, pDescr->offset, no_of_bits); + bitvec_write_field(vector, writeIndex, pDescr->offset, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)pDescr->offset); remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; diff --git a/src/csn1.h b/src/csn1.h index 1015e69..d81d82b 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -28,12 +28,7 @@ #ifndef _PACKET_CSN1_H_ #define _PACKET_CSN1_H_ -extern "C" { #include -} - -#include -#include #define MIN(a,b) (((a)<(b))?(a):(b)) //#define max(a,b) (((a)>(b))?(a):(b)) @@ -86,7 +81,7 @@ gint direction; /* 0 - decode; 1 - encode */ } csnStream_t; -typedef gint16 (*StreamSerializeFcn_t)(csnStream_t* ar, bitvec *vector, unsigned& readIndex, void* data); +typedef gint16 (*StreamSerializeFcn_t)(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data); typedef enum { CSN_END = 0, @@ -234,9 +229,9 @@ * RETURNS: int Number of bits left to be unpacked. Negative Error code if failed to unpack all bits ******************************************************************************/ -gint16 csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, bitvec *vector, unsigned& readIndex, void* data); +gint16 csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data); -gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, bitvec *vector, unsigned& readIndex, void* data); +gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data); /* CSN struct macro's */ #define CSN_DESCR_BEGIN(_STRUCT)\ diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ef7abcd..d62c3af 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -184,7 +184,7 @@ CSN_DESCR_END (EGPRS_AckNack_Desc_t) /*< EGPRS Ack/Nack Description IE >*/ -gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, bitvec *vector, unsigned& readIndex, void* data) +gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data) { if (ar->direction == 0) { @@ -745,7 +745,7 @@ M_UINT (Receive_N_PDU_Number_t, value, 8), CSN_DESCR_END (Receive_N_PDU_Number_t) -gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, bitvec *vector, unsigned& readIndex, void* data) +gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data) { if (ar->direction == 0) { @@ -856,7 +856,7 @@ M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1), CSN_DESCR_END (Content_t) -gint16 Content_Dissector(csnStream_t* ar, bitvec *vector, unsigned& readIndex, void* data) +gint16 Content_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data) { if (ar->direction == 0) { @@ -880,7 +880,7 @@ M_REC_TARRAY (Additional_access_technologies_t, Additional_access_technologies[0], Additional_access_technologies_struct_t, Count_additional_access_technologies), CSN_DESCR_END (Additional_access_technologies_t) -gint16 Additional_access_technologies_Dissector(csnStream_t* ar, bitvec* vector, unsigned& readIndex, void* data) +gint16 Additional_access_technologies_Dissector(csnStream_t* ar, bitvec* vector, unsigned *readIndex, void* data) { if (ar->direction == 0) { @@ -4825,73 +4825,73 @@ * CSNDESCR is an array that holds the different element types * ar is the csn context holding the bitcount, offset and output */ - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, readIndex, &data->u.Packet_Cell_Change_Failure); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &readIndex, &data->u.Packet_Cell_Change_Failure); break; } case MT_PACKET_CONTROL_ACK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, readIndex, &data->u.Packet_Control_Acknowledgement); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &readIndex, &data->u.Packet_Control_Acknowledgement); break; } case MT_PACKET_DOWNLINK_ACK_NACK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, readIndex, &data->u.Packet_Downlink_Ack_Nack); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Downlink_Ack_Nack); break; } case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, readIndex, &data->u.Packet_Uplink_Dummy_Control_Block); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } case MT_PACKET_MEASUREMENT_REPORT: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, readIndex, &data->u.Packet_Measurement_Report); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Measurement_Report); break; } case MT_PACKET_RESOURCE_REQUEST: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Resource_Request_t), vector, readIndex, &data->u.Packet_Resource_Request); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &readIndex, &data->u.Packet_Resource_Request); break; } case MT_PACKET_MOBILE_TBF_STATUS: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, readIndex, &data->u.Packet_Mobile_TBF_Status); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &readIndex, &data->u.Packet_Mobile_TBF_Status); break; } case MT_PACKET_PSI_STATUS: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PSI_Status_t), vector, readIndex, &data->u.Packet_PSI_Status); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &readIndex, &data->u.Packet_PSI_Status); break; } case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, readIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &readIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } case MT_PACKET_PAUSE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Pause_t), vector, readIndex, &data->u.Packet_Pause); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Pause_t), vector, &readIndex, &data->u.Packet_Pause); break; } case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, readIndex, &data->u.Packet_Enh_Measurement_Report); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Enh_Measurement_Report); break; } case MT_ADDITIONAL_MS_RAC: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, readIndex, &data->u.Additional_MS_Rad_Access_Cap); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &readIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } case MT_PACKET_CELL_CHANGE_NOTIFICATION: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, readIndex, &data->u.Packet_Cell_Change_Notification); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &readIndex, &data->u.Packet_Cell_Change_Notification); break; } case MT_PACKET_SI_STATUS: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_SI_Status_t), vector, readIndex, &data->u.Packet_SI_Status); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_SI_Status_t), vector, &readIndex, &data->u.Packet_SI_Status); break; } default: @@ -4963,127 +4963,127 @@ { case MT_PACKET_ACCESS_REJECT: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Access_Reject_t), vector, readIndex, &data->u.Packet_Access_Reject); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &readIndex, &data->u.Packet_Access_Reject); break; } case MT_PACKET_CELL_CHANGE_ORDER: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, readIndex, &data->u.Packet_Cell_Change_Order); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &readIndex, &data->u.Packet_Cell_Change_Order); break; } case MT_PACKET_CELL_CHANGE_CONTINUE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, readIndex, &data->u.Packet_Cell_Change_Continue); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &readIndex, &data->u.Packet_Cell_Change_Continue); break; } case MT_PACKET_DOWNLINK_ASSIGNMENT: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, readIndex, &data->u.Packet_Downlink_Assignment); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &readIndex, &data->u.Packet_Downlink_Assignment); break; } case MT_PACKET_MEASUREMENT_ORDER: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, readIndex, &data->u.Packet_Measurement_Order); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &readIndex, &data->u.Packet_Measurement_Order); break; } case MT_PACKET_NEIGHBOUR_CELL_DATA: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, readIndex, &data->u.Packet_Neighbour_Cell_Data); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &readIndex, &data->u.Packet_Neighbour_Cell_Data); break; } case MT_PACKET_SERVING_CELL_DATA: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, readIndex, &data->u.Packet_Serving_Cell_Data); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &readIndex, &data->u.Packet_Serving_Cell_Data); break; } case MT_PACKET_PAGING_REQUEST: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Paging_Request_t), vector, readIndex, &data->u.Packet_Paging_Request); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &readIndex, &data->u.Packet_Paging_Request); break; } case MT_PACKET_PDCH_RELEASE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, readIndex, &data->u.Packet_PDCH_Release); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &readIndex, &data->u.Packet_PDCH_Release); break; } case MT_PACKET_POLLING_REQ: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Polling_Request_t), vector, readIndex, &data->u.Packet_Polling_Request); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &readIndex, &data->u.Packet_Polling_Request); break; } case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, readIndex, &data->u.Packet_Power_Control_Timing_Advance); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &readIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } case MT_PACKET_PRACH_PARAMETERS: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, readIndex, &data->u.Packet_PRACH_Parameters); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &readIndex, &data->u.Packet_PRACH_Parameters); break; } case MT_PACKET_QUEUEING_NOTIFICATION: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, readIndex, &data->u.Packet_Queueing_Notification); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &readIndex, &data->u.Packet_Queueing_Notification); break; } case MT_PACKET_TIMESLOT_RECONFIGURE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, readIndex, &data->u.Packet_Timeslot_Reconfigure); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &readIndex, &data->u.Packet_Timeslot_Reconfigure); break; } case MT_PACKET_TBF_RELEASE: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_TBF_Release_t), vector, readIndex, &data->u.Packet_TBF_Release); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &readIndex, &data->u.Packet_TBF_Release); break; } case MT_PACKET_UPLINK_ACK_NACK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, readIndex, &data->u.Packet_Uplink_Ack_Nack); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Uplink_Ack_Nack); break; } case MT_PACKET_UPLINK_ASSIGNMENT: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, readIndex, &data->u.Packet_Uplink_Assignment); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &readIndex, &data->u.Packet_Uplink_Assignment); break; } case MT_PACKET_HANDOVER_COMMAND: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Handover_Command_t), vector, readIndex, &data->u.Packet_Handover_Command); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } case MT_PACKET_PHYSICAL_INFORMATION: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, readIndex, &data->u.Packet_Handover_Command); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, readIndex, &data->u.Packet_Downlink_Dummy_Control_Block); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } case MT_PACKET_SYSTEM_INFO_1: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI1_t), vector, readIndex, &data->u.PSI1); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI1_t), vector, &readIndex, &data->u.PSI1); break; } case MT_PACKET_SYSTEM_INFO_2: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI2_t), vector, readIndex, &data->u.PSI2); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI2_t), vector, &readIndex, &data->u.PSI2); break; } case MT_PACKET_SYSTEM_INFO_3: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI3_t), vector, readIndex, &data->u.PSI3); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI3_t), vector, &readIndex, &data->u.PSI3); break; } case MT_PACKET_SYSTEM_INFO_5: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI5_t), vector, readIndex, &data->u.PSI5); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI5_t), vector, &readIndex, &data->u.PSI5); break; } case MT_PACKET_SYSTEM_INFO_13: { - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI13_t), vector, readIndex, &data->u.PSI13); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(PSI13_t), vector, &readIndex, &data->u.PSI13); break; } default: @@ -5108,73 +5108,73 @@ * CSNDESCR is an array that holds the different element types * ar is the csn context holding the bitcount, offset and output */ - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, writeIndex, &data->u.Packet_Cell_Change_Failure); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Failure); break; } case MT_PACKET_CONTROL_ACK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, writeIndex, &data->u.Packet_Control_Acknowledgement); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &writeIndex, &data->u.Packet_Control_Acknowledgement); break; } case MT_PACKET_DOWNLINK_ACK_NACK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, writeIndex, &data->u.Packet_Downlink_Ack_Nack); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Downlink_Ack_Nack); break; } case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, writeIndex, &data->u.Packet_Uplink_Dummy_Control_Block); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } case MT_PACKET_MEASUREMENT_REPORT: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, writeIndex, &data->u.Packet_Measurement_Report); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Measurement_Report); break; } case MT_PACKET_RESOURCE_REQUEST: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Resource_Request_t), vector, writeIndex, &data->u.Packet_Resource_Request); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &writeIndex, &data->u.Packet_Resource_Request); break; } case MT_PACKET_MOBILE_TBF_STATUS: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, writeIndex, &data->u.Packet_Mobile_TBF_Status); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &writeIndex, &data->u.Packet_Mobile_TBF_Status); break; } case MT_PACKET_PSI_STATUS: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PSI_Status_t), vector, writeIndex, &data->u.Packet_PSI_Status); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &writeIndex, &data->u.Packet_PSI_Status); break; } case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, writeIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &writeIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } case MT_PACKET_PAUSE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Pause_t), vector, writeIndex, &data->u.Packet_Pause); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Pause_t), vector, &writeIndex, &data->u.Packet_Pause); break; } case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, writeIndex, &data->u.Packet_Enh_Measurement_Report); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Enh_Measurement_Report); break; } case MT_ADDITIONAL_MS_RAC: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, writeIndex, &data->u.Additional_MS_Rad_Access_Cap); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &writeIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } case MT_PACKET_CELL_CHANGE_NOTIFICATION: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, writeIndex, &data->u.Packet_Cell_Change_Notification); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Notification); break; } case MT_PACKET_SI_STATUS: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_SI_Status_t), vector, writeIndex, &data->u.Packet_SI_Status); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_SI_Status_t), vector, &writeIndex, &data->u.Packet_SI_Status); break; } default: @@ -5245,127 +5245,127 @@ { case MT_PACKET_ACCESS_REJECT: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Access_Reject_t), vector, writeIndex, &data->u.Packet_Access_Reject); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &writeIndex, &data->u.Packet_Access_Reject); break; } case MT_PACKET_CELL_CHANGE_ORDER: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, writeIndex, &data->u.Packet_Cell_Change_Order); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Order); break; } case MT_PACKET_CELL_CHANGE_CONTINUE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, writeIndex, &data->u.Packet_Cell_Change_Continue); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Continue); break; } case MT_PACKET_DOWNLINK_ASSIGNMENT: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, writeIndex, &data->u.Packet_Downlink_Assignment); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &writeIndex, &data->u.Packet_Downlink_Assignment); break; } case MT_PACKET_MEASUREMENT_ORDER: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, writeIndex, &data->u.Packet_Measurement_Order); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &writeIndex, &data->u.Packet_Measurement_Order); break; } case MT_PACKET_NEIGHBOUR_CELL_DATA: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, writeIndex, &data->u.Packet_Neighbour_Cell_Data); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Neighbour_Cell_Data); break; } case MT_PACKET_SERVING_CELL_DATA: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, writeIndex, &data->u.Packet_Serving_Cell_Data); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Serving_Cell_Data); break; } case MT_PACKET_PAGING_REQUEST: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Paging_Request_t), vector, writeIndex, &data->u.Packet_Paging_Request); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &writeIndex, &data->u.Packet_Paging_Request); break; } case MT_PACKET_PDCH_RELEASE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, writeIndex, &data->u.Packet_PDCH_Release); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &writeIndex, &data->u.Packet_PDCH_Release); break; } case MT_PACKET_POLLING_REQ: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Polling_Request_t), vector, writeIndex, &data->u.Packet_Polling_Request); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &writeIndex, &data->u.Packet_Polling_Request); break; } case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, writeIndex, &data->u.Packet_Power_Control_Timing_Advance); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &writeIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } case MT_PACKET_PRACH_PARAMETERS: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, writeIndex, &data->u.Packet_PRACH_Parameters); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &writeIndex, &data->u.Packet_PRACH_Parameters); break; } case MT_PACKET_QUEUEING_NOTIFICATION: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, writeIndex, &data->u.Packet_Queueing_Notification); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &writeIndex, &data->u.Packet_Queueing_Notification); break; } case MT_PACKET_TIMESLOT_RECONFIGURE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, writeIndex, &data->u.Packet_Timeslot_Reconfigure); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &writeIndex, &data->u.Packet_Timeslot_Reconfigure); break; } case MT_PACKET_TBF_RELEASE: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_TBF_Release_t), vector, writeIndex, &data->u.Packet_TBF_Release); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &writeIndex, &data->u.Packet_TBF_Release); break; } case MT_PACKET_UPLINK_ACK_NACK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, writeIndex, &data->u.Packet_Uplink_Ack_Nack); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Uplink_Ack_Nack); break; } case MT_PACKET_UPLINK_ASSIGNMENT: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, writeIndex, &data->u.Packet_Uplink_Assignment); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &writeIndex, &data->u.Packet_Uplink_Assignment); break; } case MT_PACKET_HANDOVER_COMMAND: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Handover_Command_t), vector, writeIndex, &data->u.Packet_Handover_Command); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } case MT_PACKET_PHYSICAL_INFORMATION: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, writeIndex, &data->u.Packet_Handover_Command); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, writeIndex, &data->u.Packet_Downlink_Dummy_Control_Block); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } case MT_PACKET_SYSTEM_INFO_1: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI1_t), vector, writeIndex, &data->u.PSI1); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI1_t), vector, &writeIndex, &data->u.PSI1); break; } case MT_PACKET_SYSTEM_INFO_2: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI2_t), vector, writeIndex, &data->u.PSI2); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI2_t), vector, &writeIndex, &data->u.PSI2); break; } case MT_PACKET_SYSTEM_INFO_3: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI3_t), vector, writeIndex, &data->u.PSI3); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI3_t), vector, &writeIndex, &data->u.PSI3); break; } case MT_PACKET_SYSTEM_INFO_5: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI5_t), vector, writeIndex, &data->u.PSI5); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI5_t), vector, &writeIndex, &data->u.PSI5); break; } case MT_PACKET_SYSTEM_INFO_13: { - /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI13_t), vector, writeIndex, &data->u.PSI13); + /*ret =*/ csnStreamEncoder(&ar, CSNDESCR(PSI13_t), vector, &writeIndex, &data->u.PSI13); break; } default: @@ -5515,5 +5515,5 @@ csnStream_t ar; unsigned readIndex = 0; csnStreamInit(&ar, 0, 8 * vector->data_len); - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data); + /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data); } diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index a4750e8..717f84c 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -32,7 +32,10 @@ #ifndef __PACKET_GSM_RLCMAC_H__ #define __PACKET_GSM_RLCMAC_H__ +extern "C" { #include "csn1.h" +} + #include #include diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index acfe56a..7cad0f4 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -23,7 +23,6 @@ #include #include #include -#include "csn1.h" #include "gsm_rlcmac.h" #include "gprs_rlcmac.h" @@ -35,6 +34,8 @@ #include #include #include + +#include "csn1.h" } using namespace std; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56d8b7fbd2f9f4e0bdd6b09d0366fe7eb7aa327a Gerrit-Change-Number: 17010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:27 +0000 Subject: Change in osmo-msc[master]: vlr: remove unused parameter 'log_level' of auth_fsm_start() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17011 ) Change subject: vlr: remove unused parameter 'log_level' of auth_fsm_start() ...................................................................... vlr: remove unused parameter 'log_level' of auth_fsm_start() We unconditionally use logging level of the parent FSM anyway. All callers of auth_fsm_start() always pass fi->log_level. Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d --- M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_auth_fsm.h M src/libvlr/vlr_lu_fsm.c 4 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/17011/1 diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 7684d02..73f8955 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -338,7 +338,7 @@ if (is_auth_required(par)) { osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_AUTH, 0, 0); - vsub->auth_fsm = auth_fsm_start(vsub, fi->log_level, fi, + vsub->auth_fsm = auth_fsm_start(vsub, fi, PR_ARQ_E_AUTH_RES, par->is_r99, par->is_utran); diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index dcdf584..1cacbce 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -596,7 +596,6 @@ /* MSC->VLR: Start Procedure Authenticate_VLR (TS 23.012 Ch. 4.1.2.2) */ struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, - uint32_t log_level, struct osmo_fsm_inst *parent, uint32_t parent_term_event, bool is_r99, diff --git a/src/libvlr/vlr_auth_fsm.h b/src/libvlr/vlr_auth_fsm.h index 1f2cb49..4be889f 100644 --- a/src/libvlr/vlr_auth_fsm.h +++ b/src/libvlr/vlr_auth_fsm.h @@ -30,7 +30,6 @@ struct osmo_fsm vlr_auth_fsm; struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, - uint32_t log_level, struct osmo_fsm_inst *parent, uint32_t parent_term_event, bool is_r99, diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index e4d40f0..d5425e7 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -906,7 +906,7 @@ /* Authenticate_VLR */ osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_AUTH, LU_TIMEOUT_LONG, 0); - vsub->auth_fsm = auth_fsm_start(lfp->vsub, fi->log_level, + vsub->auth_fsm = auth_fsm_start(lfp->vsub, fi, VLR_ULA_E_AUTH_RES, lfp->is_r99, lfp->is_utran); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d Gerrit-Change-Number: 17011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:28 +0000 Subject: Change in osmo-msc[master]: vlr_sgs_fsm: add missing break, do not call to_null() twice References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17012 ) Change subject: vlr_sgs_fsm: add missing break, do not call to_null() twice ...................................................................... vlr_sgs_fsm: add missing break, do not call to_null() twice Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb --- M src/libvlr/vlr_sgs_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/12/17012/1 diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index a131b7e..0f21617 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -234,6 +234,7 @@ if (*cause == SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER) break; to_null(fi); + break; case SGS_UE_E_RX_ALERT_FAILURE: to_null(fi); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb Gerrit-Change-Number: 17012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:29 +0000 Subject: Change in osmo-msc[master]: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17013 ) Change subject: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() ...................................................................... msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() The problem is that osmo_rat_type_name() calls get_value_string(), so we first cast -1 to 'const enum osmo_rat_type' and then to 'uint32_t'. Let's rather use OSMO_RAT_UNKNOWN. Found by GCC with -Wextra in CFLAGS: warning: operand of ?: changes signedness from ?int? to ?const enum osmo_rat_type? due to unsignedness of other operand [-Wsign-compare] Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 --- M include/osmocom/msc/sccp_ran.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/17013/1 diff --git a/include/osmocom/msc/sccp_ran.h b/include/osmocom/msc/sccp_ran.h index f190d91..f84bf61 100644 --- a/include/osmocom/msc/sccp_ran.h +++ b/include/osmocom/msc/sccp_ran.h @@ -189,14 +189,14 @@ #define LOG_SCCP_RAN_CO(sri, peer_addr, conn_id, level, fmt, args...) \ LOGP((sri) && (sri)->ran? (sri)->ran->log_subsys : DMSC, level, "(%s-%u%s%s) " fmt, \ - osmo_rat_type_name((sri) && (sri)->ran? (sri)->ran->type : -1), conn_id, \ + osmo_rat_type_name((sri) && (sri)->ran ? (sri)->ran->type : OSMO_RAT_UNKNOWN), conn_id, \ peer_addr ? " from " : "", \ peer_addr ? osmo_sccp_inst_addr_name((sri)->sccp, peer_addr) : "", \ ## args) #define LOG_SCCP_RAN_CL_CAT(sri, peer_addr, subsys, level, fmt, args...) \ LOGP(subsys, level, "(%s%s%s) " fmt, \ - osmo_rat_type_name((sri) && (sri)->ran? (sri)->ran->type : -1), \ + osmo_rat_type_name((sri) && (sri)->ran ? (sri)->ran->type : OSMO_RAT_UNKNOWN), \ peer_addr ? " from " : "", \ peer_addr ? osmo_sccp_inst_addr_name((sri)->sccp, peer_addr) : "", \ ## args) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 Gerrit-Change-Number: 17013 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:30 +0000 Subject: Change in osmo-msc[master]: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17014 ) Change subject: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static ...................................................................... VTY: cosmetic: make struct cmd_node for GSMNET_NODE static We don't need to expose it anyway. Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 --- M src/libmsc/msc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/17014/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cd82a07..2f35173 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -68,7 +68,7 @@ static struct gsm_network *gsmnet = NULL; -struct cmd_node net_node = { +static struct cmd_node net_node = { GSMNET_NODE, "%s(config-net)# ", 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 Gerrit-Change-Number: 17014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:30 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17015 ) Change subject: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() ...................................................................... libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 --- M src/libmsc/gsm_04_08.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/17015/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b284ccd..df48bcb 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1237,8 +1237,9 @@ apdu_len = gh->data[1]; apdu_data = gh->data+2; - DEBUGP(DRR, "RX APPLICATION INFO id/flags=0x%02x apdu_len=%u apdu=%s\n", - apdu_id_flags, apdu_len, osmo_hexdump(apdu_data, apdu_len)); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_DEBUG, "Rx RR APPLICATION INFO " + "(id/flags=0x%02x apdu_len=%u apdu=%s)\n", + apdu_id_flags, apdu_len, osmo_hexdump(apdu_data, apdu_len)); /* we're not using the app info blob anywhere, so ignore. */ #if 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 Gerrit-Change-Number: 17015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 00:28:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 00:28:30 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17016 ) Change subject: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM ...................................................................... libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/17016/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index df48bcb..d612e40 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1153,13 +1153,13 @@ struct vlr_subscr *vsub; if (msc_a_is_establishing_auth_ciph(msc_a)) { - LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR, + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "Ignoring Paging Response, conn already busy establishing authenticity\n"); return 0; } if (msc_a_is_accepted(msc_a)) { - LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR, "Ignoring Paging Response, conn already established\n"); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "Ignoring Paging Response, conn already established\n"); return 0; } @@ -1184,7 +1184,7 @@ * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occurred? */ vsub = msc_a_vsub(msc_a); if (!vsub) { - LOG_MSC_A(msc_a, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); return -EIO; } diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 3de18bf..8953c1d 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -529,7 +529,7 @@ DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity +DRR msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) lu_result_sent == 0 llist_count(&msub_list) == 1 @@ -1270,7 +1270,7 @@ DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established +DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_sms) llist_count(&msub_list) == 1 @@ -2154,7 +2154,7 @@ DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established +DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) - MS replies with CP-ACK for received SMS MSC <--GERAN-A-- MS: SMS:0x04 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 Gerrit-Change-Number: 17016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 02:57:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 02:57:03 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() Some osmo-* applications may need to use their own VTY node as a parent for the timer configuration commands. Therefore it makes more sense to use 'int' instead of 'enum node_type'. Let's also clarify that osmo_tdef_vty_groups_init() accepts parent node for configuration commands only: 'parent_node' -> 'cfg_node'. Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c --- M include/osmocom/vty/tdef_vty.h M src/vty/tdef_vty.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/17017/1 diff --git a/include/osmocom/vty/tdef_vty.h b/include/osmocom/vty/tdef_vty.h index 6334d5b..c054e22 100644 --- a/include/osmocom/vty/tdef_vty.h +++ b/include/osmocom/vty/tdef_vty.h @@ -68,7 +68,7 @@ struct osmo_tdef *osmo_tdef_vty_parse_T_arg(struct vty *vty, struct osmo_tdef *tdefs, const char *osmo_tdef_str); unsigned long osmo_tdef_vty_parse_val_arg(const char *val_arg, unsigned long default_val); -void osmo_tdef_vty_groups_init(enum node_type parent_node, struct osmo_tdef_group *groups); +void osmo_tdef_vty_groups_init(int cfg_node, struct osmo_tdef_group *groups); void osmo_tdef_vty_groups_write(struct vty *vty, const char *indent); /*! @} */ diff --git a/src/vty/tdef_vty.c b/src/vty/tdef_vty.c index 4549a61..1f661b7 100644 --- a/src/vty/tdef_vty.c +++ b/src/vty/tdef_vty.c @@ -361,10 +361,10 @@ * The given timer definitions group is stored in a global pointer, so this can be done only once per main() scope. * It would also be possible to have distinct timer groups on separate VTY subnodes, with a "manual" implementation, but * not with this API. - * \param[in] parent_node VTY node id at which to add the timer group commands, e.g. CONFIG_NODE. + * \param[in] cfg_node VTY node at which to add the timer configuration commands, e.g. CONFIG_NODE. * \param[in] groups Global timer groups definition. */ -void osmo_tdef_vty_groups_init(enum node_type parent_node, struct osmo_tdef_group *groups) +void osmo_tdef_vty_groups_init(int cfg_node, struct osmo_tdef_group *groups) { struct osmo_tdef_group *g; OSMO_ASSERT(!global_tdef_groups); @@ -380,7 +380,7 @@ cfg_timer_cmd.doc = timer_doc_string("Configure or show timers\n", OSMO_TDEF_VTY_DOC_SET); install_element_ve(&show_timer_cmd); - install_element(parent_node, &cfg_timer_cmd); + install_element(cfg_node, &cfg_timer_cmd); } /*! Write the global osmo_tdef_group configuration to VTY, as previously passed to osmo_tdef_vty_groups_init(). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 03:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 03:56:13 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 to look at the new patch set (#2). Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 These timers so far were implemented as a list of unsigned integers, which has never been initialized to any reasonable defaults. Since they are used as state timeouts in several FSMs, we might end up staying in some state forever. Let's migrate to generic osmo_tdef API and use default values from table 11.2 of 3GPP TS 24.008. This way the user can introspect and change their values from the VTY / configuration file. Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/msc_common.h M include/osmocom/msc/vlr.h M src/libmsc/msc_net_init.c M src/libvlr/vlr.c M tests/test_nodes.vty 6 files changed, 22 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/16933/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 03:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 03:56:13 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 to look at the new patch set (#2). Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... VTY: add osmo_tdef introspection and configuration commands This change introduces several new VTY commands letting the user a possibility to introspect and reconfigure some of the existing timers implemented using libosmocore's osmo_tdef API. At the moment this covers the following timers: - MGW specific timers: - X1 - MGCP response timeout, - X2 - RTP stream establishing timeout, - RAN specific timers (same names for GERAN and UTRAN): - X1 - Authentication and Ciphering timeout, - X2 - RAN connection release sanity timeout, - X3 - Handover procedure timeout. The following commands are introduced: - 'enable' node: - show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] - 'config-msc' node: - timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] Both MNCC and SCCP related timer definitions are empty at the moment. Achieved by using osmo_tdef_group API of libosmovty. Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/msc_common.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/test_nodes.vty 5 files changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/16932/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 03:56:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 03:56:13 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 to look at the new patch set (#3). Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 50 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/16934/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 04:04:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 04:04:44 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 to look at the new patch set (#4). Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 48 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/16934/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 04:52:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 04:52:40 +0000 Subject: Change in osmo-msc[master]: VTY: mark 'subscriber create imsi' command as deprecated In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16954 ) Change subject: VTY: mark 'subscriber create imsi' command as deprecated ...................................................................... VTY: mark 'subscriber create imsi' command as deprecated Neither it should appear in the interactive VTY nor in documentation. Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 --- M doc/manuals/vty/msc_vty_reference.xml M src/libmsc/msc_vty.c 2 files changed, 6 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved neels: Looks good to me, approved diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index b98f76e..7fba1a9 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -668,14 +668,6 @@ - - - - - - - - @@ -1492,14 +1484,6 @@ - - - - - - - - diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cd82a07..90cfc9d 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1222,13 +1222,12 @@ return CMD_SUCCESS; } -DEFUN(subscriber_create, - subscriber_create_cmd, - "subscriber create imsi ID", - "Operations on a Subscriber\n" \ - "Create new subscriber\n" \ - "Identify the subscriber by his IMSI\n" \ - "Identifier for the subscriber\n") +DEFUN_DEPRECATED(subscriber_create, subscriber_create_cmd, + "subscriber create imsi ID", + "Operations on a Subscriber\n" + "Create new subscriber\n" + "Identify the subscriber by his IMSI\n" + "Identifier for the subscriber\n") { vty_out(vty, "%% 'subscriber create' now needs to be done at osmo-hlr%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I208faab69a40948af5d081edbeaf75f586dfb2e4 Gerrit-Change-Number: 16954 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:20:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:20:49 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1/src/csn1.cpp File src/csn1.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1/src/csn1.cpp at 1042 PS1, Line 1042: no break > Isn't this enough for a compiler to guess that break is omitted intentionally? Ok, I figured out why: they build Wireshark with -Wextra. This gives a lot of warnings, but some of them may be very helpful. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 25 Jan 2020 05:20:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:48:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:48:37 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16982 to look at the new patch set (#2). Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Fix compatibility with Python 3: print() is a function Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 --- M README.md M pySim-prog.py M pySim-read.py M pySim/card_handler.py M pySim/transport/serial.py 5 files changed, 51 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/16982/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:48:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:48:38 +0000 Subject: Change in pysim[master]: TEST: Revert "Added feature to read Service Provider Name (SPN) from ... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/17018 ) Change subject: TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card" ...................................................................... TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card" This reverts commit f8299451179cf0cb22d23ff7a9c6f5ced8ed7e20. Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 --- M pySim-read.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok 7 files changed, 1 insertion(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/17018/1 diff --git a/pySim-read.py b/pySim-read.py old mode 100644 new mode 100755 index 662ee54..4bfa900 --- a/pySim-read.py +++ b/pySim-read.py @@ -37,7 +37,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act def parse_options(): @@ -121,17 +121,6 @@ else: print("SMSP: Can't read, response code = %s" % (sw,)) - # EF.SPN - try: - (res, sw) = scc.read_binary(EF['SPN']) - if sw == '9000': - spn_res = dec_spn(res) - print("SPN: %s\nDisplay HPLMN: %s\nDisplay OPLMN: %s" % (spn_res[0], spn_res[1], spn_res[2],)) - else: - print("SPN: Can't read, response code = %s" % (sw,)) - except Exception as e: - print("SPN: Can't read file -- %s" % (str(e),)) - # EF.PLMNsel try: (res, sw) = scc.read_binary(EF['PLMNsel']) diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 94df376..6150469 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -3,9 +3,6 @@ ICCID: 8988219000000117833 IMSI: 001010000000111 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff -SPN: Fairwaves -Display HPLMN: False -Display OPLMN: False PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: ffffff0000 # unused diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 8b14a30..b0ea8be 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -3,9 +3,6 @@ ICCID: 89445310150011013678 IMSI: 001010000000102 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff -SPN: wavemobile -Display HPLMN: False -Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index 8d4583d..d9bff94 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -3,9 +3,6 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: Magic -Display HPLMN: True -Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index 7346134..fb191e0 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -3,9 +3,6 @@ ICCID: 8988211900000000004 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: -Display HPLMN: False -Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 5ad34e4..b6a5391 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -3,9 +3,6 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: -Display HPLMN: False -Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index b306f4d..d4c3dd9 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -3,9 +3,6 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: -Display HPLMN: False -Display OPLMN: False PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 Gerrit-Change-Number: 17018 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:48:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:48:39 +0000 Subject: Change in pysim[master]: pySim-read.py: fix copy-paste mistake: s/HPLMNAcT/PLMNsel/ References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/17019 ) Change subject: pySim-read.py: fix copy-paste mistake: s/HPLMNAcT/PLMNsel/ ...................................................................... pySim-read.py: fix copy-paste mistake: s/HPLMNAcT/PLMNsel/ Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 --- M pySim-read.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/19/17019/1 diff --git a/pySim-read.py b/pySim-read.py index 6b2fed6..80251b6 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -129,7 +129,7 @@ else: print("PLMNsel: Can't read, response code = %s" % (sw,)) except Exception as e: - print("HPLMNAcT: Can't read file -- " + str(e)) + print("PLMNsel: Can't read file -- " + str(e)) # EF.PLMNwAcT try: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 Gerrit-Change-Number: 17019 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:49:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:49:53 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 to look at the new patch set (#5). Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 54 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/16934/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 05:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 05:52:42 +0000 Subject: Change in pysim[master]: TEST: Revert "Added feature to read Service Provider Name (SPN) from ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17018 ) Change subject: TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card" ...................................................................... Patch Set 1: So this means that the test setup (with SIM cards and readers) is somehow broken. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 Gerrit-Change-Number: 17018 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Sat, 25 Jan 2020 05:52:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 18:02:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 25 Jan 2020 18:02:54 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... Patch Set 1: That looks like a specialvalue passed to do something specific. Are you it can be dropped? or it makes more sense to simply change the value to INT_MAX? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 25 Jan 2020 18:02:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 18:09:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 18:09:09 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... Patch Set 1: > Patch Set 1: > > That looks like a specialvalue passed to do something specific. Are you it can be dropped? or it makes more sense to simply change the value to INT_MAX? You're probably right. I just found a similar check in libosmocore's timer.c. But the key difference is that libosmocore's version of update_nearest() accepts 'struct timeval *', while we accept a signed integer in OsmoPCU. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 25 Jan 2020 18:09:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 18:17:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 18:17:20 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > That looks like a specialvalue passed to do something specific. Are you it can be dropped? or it makes more sense to simply change the value to INT_MAX? > > You're probably right. I just found a similar check in libosmocore's timer.c. But the key difference is that libosmocore's version of update_nearest() accepts 'struct timeval *', while we accept a signed integer in OsmoPCU. Ok, found some more details: this function was actually repurposed to deal with TDMA frame numbers, which are represented as signed integers (do not ask me why). In other words, OsmoPCU's update_nearest() never deals with timers, so getting LONG_MAX is impossible. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 25 Jan 2020 18:17:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:26:00 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 25 Jan 2020 19:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:26:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:26:34 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:26:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:26:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:26:52 +0000 Subject: Change in osmo-pcu[master]: encoding: fix log_alert_exit(): do not treat error as format string In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17008 ) Change subject: encoding: fix log_alert_exit(): do not treat error as format string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 Gerrit-Change-Number: 17008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:26:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:27:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:27:28 +0000 Subject: Change in osmo-pcu[master]: tests/alloc: fix implicit conversion from 'double' to 'int8_t' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17009 ) Change subject: tests/alloc: fix implicit conversion from 'double' to 'int8_t' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b Gerrit-Change-Number: 17009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:27:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:30:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:30:40 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16989 ) Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:30:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:31:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:31:10 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:31:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:31:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:31:44 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 25 Jan 2020 19:31:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:32:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:32:16 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Don't check stderr output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16992 ) Change subject: tests/rlcmac: Don't check stderr output ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 Gerrit-Change-Number: 16992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:32:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:32:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:32:56 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... Patch Set 2: agreeing with fixeria -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:32:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:33:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:33:00 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Memzero decoded struct In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16989 ) Change subject: tests/rlcmac: Memzero decoded struct ...................................................................... tests/rlcmac: Memzero decoded struct Otherwise final output is undefined. Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index acfe56a..5ed8c0f 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -119,12 +119,13 @@ cout << hex << (unsigned)*(vector->data + i); } cout << endl; - RlcMacDownlink_t * data = (RlcMacDownlink_t *)malloc(sizeof(RlcMacDownlink_t)); + RlcMacDownlink_t data; + memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; - decode_gsm_rlcmac_downlink(vector, data); + decode_gsm_rlcmac_downlink(vector, &data); cout << "+++++++++Finish DECODE++++++++++" << endl; cout << "=========Start ENCODE=============" << endl; - encode_gsm_rlcmac_downlink(resultVector, data); + encode_gsm_rlcmac_downlink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; cout << "vector1 = "; for (int i = 0; i < 23; i++) @@ -148,7 +149,6 @@ } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); - free(data); } bitvec_free(resultVector); @@ -183,12 +183,13 @@ cout << hex << (unsigned)*(vector->data + i); } cout << endl; - RlcMacUplink_t * data = (RlcMacUplink_t *)malloc(sizeof(RlcMacUplink_t)); + RlcMacUplink_t data; + memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; - decode_gsm_rlcmac_uplink(vector, data); + decode_gsm_rlcmac_uplink(vector, &data); cout << "+++++++++Finish DECODE++++++++++" << endl; cout << "=========Start ENCODE=============" << endl; - encode_gsm_rlcmac_uplink(resultVector, data); + encode_gsm_rlcmac_uplink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; cout << "vector1 = "; for (int i = 0; i < 23; i++) @@ -212,7 +213,6 @@ } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); - free(data); } bitvec_free(resultVector); @@ -227,6 +227,7 @@ bitvec_unhex(vector, "40200bffd161003e0e519ffffffb800000000000000000"); RlcMacUplink_t data; + memset(&data, 0, sizeof(data)); EGPRS_AckNack_Desc_t *urbb = &data.u.Egprs_Packet_Downlink_Ack_Nack.EGPRS_AckNack.Desc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9b501b8a99473b4d79279f8a3a9854e0b2eb3284 Gerrit-Change-Number: 16989 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:33:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:33:01 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Fix missing commas with unexpected results In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16987 ) Change subject: tests/rlcmac: Fix missing commas with unexpected results ...................................................................... tests/rlcmac: Fix missing commas with unexpected results Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 29 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 5ed8c0f..4af450b 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -100,10 +100,10 @@ "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment (EGPRS) "40284f0000001009810c826f4406809dcecb2b2b2b2b2b", // Packet Uplink Assignment (EGPRS) - "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Ack Nack (EGPRS) - "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" - "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b" - "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b" + "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Ack Nack (EGPRS) + "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b", // Polling Request? + "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b", // Packet Uplink Ack Nack? + "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // System Info 13? }; int testDataSize = sizeof(testData)/sizeof(testData[0]); @@ -166,7 +166,7 @@ "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request "40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // EPDAN - "400a9020000000000000003010012a0800132b2b2b2b2b" + "400a9020000000000000003010012a0800132b2b2b2b2b", // Packet Downlink Ack/Nack ? }; int testDataSize = sizeof(testData)/sizeof(testData[0]); diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index d61c62f..05bfc2e 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -56,6 +56,30 @@ vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE +vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 491312b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 == vector2 : FALSE +vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector2 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 == vector2 : TRUE +vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 == vector2 : TRUE *** testRlcMacUplink *** UPLINK vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0f8cc224a4c38e80699f834fd83d4c0d99322ea Gerrit-Change-Number: 16987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:33:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:33:01 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Use osmo_hexdump to print buffers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16988 ) Change subject: tests/rlcmac: Use osmo_hexdump to print buffers ...................................................................... tests/rlcmac: Use osmo_hexdump to print buffers Old method takes lots of lines of codes and prints inn unconfortable way because left-trailing zeros are dropped, making it difficult to split in bytes. Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 2 files changed, 52 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 4af450b..e48a27c 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -111,14 +111,10 @@ cout << " DOWNLINK " << endl; for (int i = 0; i < testDataSize; i++) { + cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << hex << (unsigned)*(vector->data + i); - } - cout << endl; + RlcMacDownlink_t data; memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; @@ -127,26 +123,12 @@ cout << "=========Start ENCODE=============" << endl; encode_gsm_rlcmac_downlink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(vector->data + i); - } - cout << endl; - cout << "vector2 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(resultVector->data + i); - } - cout << endl; + cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; + cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; if (memcmp(vector->data, resultVector->data, 23) == 0) - { cout << "vector1 == vector2 : TRUE" << endl; - } else - { cout << "vector1 == vector2 : FALSE" << endl; - } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); } @@ -175,14 +157,10 @@ cout << " UPLINK " << endl; for (int i = 0; i < testDataSize; i++) { + cout << "vector1 = " << testData[i] << endl; bitvec *vector = bitvec_alloc(23, test_ctx); bitvec_unhex(vector, testData[i].c_str()); - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << hex << (unsigned)*(vector->data + i); - } - cout << endl; + RlcMacUplink_t data; memset(&data, 0, sizeof(data)); cout << "=========Start DECODE===========" << endl; @@ -191,26 +169,12 @@ cout << "=========Start ENCODE=============" << endl; encode_gsm_rlcmac_uplink(resultVector, &data); cout << "+++++++++Finish ENCODE+++++++++++" << endl; - cout << "vector1 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(vector->data + i); - } - cout << endl; - cout << "vector2 = "; - for (int i = 0; i < 23; i++) - { - cout << (unsigned)*(resultVector->data + i); - } - cout << endl; + cout << "vector1 = " << osmo_hexdump(vector->data, 23) << endl; + cout << "vector2 = " << osmo_hexdump(resultVector->data, 23) << endl; if (memcmp(vector->data, resultVector->data, 23) == 0) - { cout << "vector1 == vector2 : TRUE" << endl; - } else - { cout << "vector1 == vector2 : FALSE" << endl; - } bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); } diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 05bfc2e..2af4d90 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -1,125 +1,125 @@ *** testRlcMacDownlink *** DOWNLINK -vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b +vector1 = 4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b -vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b +vector1 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 4e 08 25 00 e3 f1 a8 1d 08 08 20 80 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector1 = 48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b -vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector1 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 48 28 24 07 a6 a0 74 22 72 01 00 03 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b +vector1 = 47240c00400000000000000079eb2ac9402b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b -vector2 = 4724c040000000079eb2ac9402b2b2b2b2b2b +vector1 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b +vector2 = 47 24 0c 00 40 00 00 00 00 00 00 00 79 eb 2a c9 40 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 47 28 3c 36 75 13 ba 33 30 04 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b +vector1 = 400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b -vector2 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b +vector1 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 08 20 00 1a 39 04 df 06 80 ef b3 30 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector1 = 40284f0000001009810c826f4406809dcecb2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b -vector2 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector1 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b +vector2 = 40 28 4f 00 00 00 10 09 81 0c 82 6f 44 06 80 9d ce cb 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b +vector1 = 4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b -vector2 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 24 03 0f 2f 00 00 00 00 87 b0 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4913e0850884013a848b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 491312b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 49 13 e0 08 50 88 40 13 a8 04 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 49 13 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : FALSE -vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 = 412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b -vector2 = 41243007fffffffffffffffefd19c7ba12b2b2b2b2b2b +vector1 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b +vector2 = 41 24 30 00 7f ff ff ff ff ff ff ff ef d1 9c 7b a1 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 41 94 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testRlcMacUplink *** UPLINK -vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 0e 1e 61 d1 1d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector1 = 400b8020000000000000002480e0032b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b -vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector1 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 0b 80 20 00 00 00 00 00 00 00 24 80 e0 03 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b +vector1 = 4016713dc094270ca2ae57ef909006aa0fc0001f80222b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b -vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b +vector1 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b +vector2 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b vector1 == vector2 : TRUE -vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4020ffc021ec1b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +vector2 = 40 20 0f fc 00 21 ec 01 0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b vector1 == vector2 : TRUE -vector1 = 40a90200000000301012a80132b2b2b2b2b +vector1 = 400a9020000000000000003010012a0800132b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40a90200000000301012a80132b2b2b2b2b -vector2 = 40a90200000000301012a80132b2b2b2b2b +vector1 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b +vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testCsnLeftAlignedVarBmpBounds *** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I56c24f934824e4e52a91a7273aec384b2e15aa67 Gerrit-Change-Number: 16988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:33:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:33:01 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Don't check stderr output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16992 ) Change subject: tests/rlcmac: Don't check stderr output ...................................................................... tests/rlcmac: Don't check stderr output Current stderr output is empty anyway, and not checking it allows enavling different log levels to easily debug issues. Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 --- M tests/Makefile.am D tests/rlcmac/RLCMACTest.err M tests/testsuite.at 3 files changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index c599636..c9a376f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -136,7 +136,7 @@ EXTRA_DIST = \ testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ - rlcmac/RLCMACTest.ok rlcmac/RLCMACTest.err \ + rlcmac/RLCMACTest.ok \ alloc/AllocTest.ok alloc/AllocTest.err \ tbf/TbfTest.err \ bitcomp/BitcompTest.ok bitcomp/BitcompTest.err \ diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err deleted file mode 100644 index e69de29..0000000 --- a/tests/rlcmac/RLCMACTest.err +++ /dev/null diff --git a/tests/testsuite.at b/tests/testsuite.at index 8a319bd..fe87ff9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -5,8 +5,7 @@ AT_SETUP([rlcmac]) AT_KEYWORDS([rlcmac]) cat $abs_srcdir/rlcmac/RLCMACTest.ok > expout -cat $abs_srcdir/rlcmac/RLCMACTest.err > experr -AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [experr]) +AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [ignore]) AT_CLEANUP AT_SETUP([multi_slot]) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b12e919e08a6eeaad31a459e5a15fdee4d76a61 Gerrit-Change-Number: 16992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:33:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:33:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16994 ) Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:33:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:34:29 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 2 PS1, Line 2: Pau Espin Pedrol > It's actually Anders Broman. Ack https://gerrit.osmocom.org/c/osmo-pcu/+/16995/1//COMMIT_MSG at 9 PS1, Line 9: Fort Fork? Port? Fart? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:34:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:36:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:36:08 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Sat, 25 Jan 2020 19:36:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:36:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:36:47 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Sat, 25 Jan 2020 19:36:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:39:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:39:14 +0000 Subject: Change in pysim[master]: Added checks for SPN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: Added checks for SPN ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:39:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:39:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:39:59 +0000 Subject: Change in pysim[master]: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: Added ability to write HPLMN_ACT in sysmoUSIM-SJS1 SIM ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 19:42:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jan 2020 19:42:10 +0000 Subject: Change in pysim[master]: Added feature to parse Service table based on SIM type. If USIM is pr... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG at 7 PS1, Line 7: A Just for clarity: EF.SST and EF.UST or EF.IST are not exclusive at all. You can have an ISIM that has ISIM, USIM and SIM apps present. In that case those three files exist in parallel, and they have different contents. And depending on which type of phone you insert the card, either one or multiple of those files will be used by the phone. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 19:42:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 20:09:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 20:09:10 +0000 Subject: Change in pysim[master]: Added checks for SPN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: Added checks for SPN ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 25 Jan 2020 20:09:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jan 25 20:14:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 25 Jan 2020 20:14:59 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16941/4/pySim/cards.py at 616 PS4, Line 616: True, True Can we make these flags configurable? Currently you're not only programming SPN, but also enabling display of HPLMN and OPLMN. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 25 Jan 2020 20:14:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:31:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:31:53 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/17017/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/17017/1//COMMIT_MSG at 14 PS1, Line 14: parent_node I thought parent_node is better. parent_cfg_node might be best. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:31:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:37:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:37:33 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jan 2020 10:37:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:38:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:38:28 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jan 2020 10:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:39:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:39:30 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 26 Jan 2020 10:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:40:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:40:08 +0000 Subject: Change in pysim[master]: pySim-read.py: fix copy-paste mistake: s/HPLMNAcT/PLMNsel/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17019 ) Change subject: pySim-read.py: fix copy-paste mistake: s/HPLMNAcT/PLMNsel/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 Gerrit-Change-Number: 17019 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:40:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:41:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:41:26 +0000 Subject: Change in pysim[master]: TEST: Revert "Added feature to read Service Provider Name (SPN) from ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17018 ) Change subject: TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card" ...................................................................... Patch Set 1: Code-Review-1 would be useful to have a more verbose commit log entry. If this is something you want to test but not merge, it should also be marked as WIP and/or contain something like "DO NOT MERGE" in the commitlog. "TEST" can very well refer to some kind of test code that's modified. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 Gerrit-Change-Number: 17018 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Sun, 26 Jan 2020 10:41:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:43:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:43:23 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jan 2020 10:43:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:47:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:47:27 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 6: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py at 81 PS5, Line 81: data = self._scc.read_binary(EF['HPLMNwAcT'], length=None, offset=0) > let's remove the old, commented out code. [?] this doesn't seem to have been adressed yet. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Sun, 26 Jan 2020 10:47:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:47:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:47:47 +0000 Subject: Change in osmo-pcu[master]: csn1: Try to fix cast discards '__attribute__((const))' qualifier fro... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17003 ) Change subject: csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 Gerrit-Change-Number: 17003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:48:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:48:09 +0000 Subject: Change in osmo-pcu[master]: csn1: Don't cast away constness In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17002 ) Change subject: csn1: Don't cast away constness ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 Gerrit-Change-Number: 17002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:48:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:48:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:48:33 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix an infinite loop in CSN.1 dissector when having more than 2... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17000 ) Change subject: csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 Gerrit-Change-Number: 17000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:48:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:48:56 +0000 Subject: Change in osmo-pcu[master]: csn1: Drop format_p union from CSN_DESCR In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17004 ) Change subject: csn1: Drop format_p union from CSN_DESCR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8889252ee7518a919a15d749815c2803b4b23cd Gerrit-Change-Number: 17004 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:48:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:50:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:50:56 +0000 Subject: Change in osmo-pcu[master]: csn1: Allow CHOICE elements to re-process the bits used for the choice In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16998 ) Change subject: csn1: Allow CHOICE elements to re-process the bits used for the choice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3a5a95d5f918b8f17a2400a6d0c4d855ecacea7e Gerrit-Change-Number: 16998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:50:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:51:19 +0000 Subject: Change in osmo-pcu[master]: csn1: Extend CSN_SERIALIZE to allow 0 bit of length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16997 ) Change subject: csn1: Extend CSN_SERIALIZE to allow 0 bit of length ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fadc99218594447001f7bb9943f4514b9877799 Gerrit-Change-Number: 16997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:51:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:51:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:51:30 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix warning with -Wmissing-prototypes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17001 ) Change subject: csn1: Fix warning with -Wmissing-prototypes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 Gerrit-Change-Number: 17001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:52:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:52:07 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix pedantic compiler warnings in csn.1 dissectors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16999 ) Change subject: csn1: Fix pedantic compiler warnings in csn.1 dissectors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia1a8c50c4b024ca6df4e3fbbf891cd33591ccc9b Gerrit-Change-Number: 16999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:52:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:53:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:53:11 +0000 Subject: Change in osmo-msc[master]: vlr_sgs_fsm: add missing break, do not call to_null() twice In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17012 ) Change subject: vlr_sgs_fsm: add missing break, do not call to_null() twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb Gerrit-Change-Number: 17012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:53:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:53:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:53:43 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17016 ) Change subject: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 Gerrit-Change-Number: 17016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:53:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:53:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:53:54 +0000 Subject: Change in osmo-msc[master]: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17014 ) Change subject: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 Gerrit-Change-Number: 17014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:53:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:54:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:54:22 +0000 Subject: Change in osmo-msc[master]: vlr: remove unused parameter 'log_level' of auth_fsm_start() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17011 ) Change subject: vlr: remove unused parameter 'log_level' of auth_fsm_start() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d Gerrit-Change-Number: 17011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Sun, 26 Jan 2020 10:54:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:54:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:54:42 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17015 ) Change subject: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 Gerrit-Change-Number: 17015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 10:54:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:55:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:55:23 +0000 Subject: Change in osmo-msc[master]: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17013 ) Change subject: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 Gerrit-Change-Number: 17013 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Sun, 26 Jan 2020 10:55:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:57:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:57:34 +0000 Subject: Change in simtrace2[master]: increase ringbuffer size from 512 to 1024 bytes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16919 ) Change subject: increase ringbuffer size from 512 to 1024 bytes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Gerrit-Change-Number: 16919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 26 Jan 2020 10:57:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 10:57:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 10:57:38 +0000 Subject: Change in simtrace2[master]: increase ringbuffer size from 512 to 1024 bytes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16919 ) Change subject: increase ringbuffer size from 512 to 1024 bytes ...................................................................... increase ringbuffer size from 512 to 1024 bytes As reported in https://osmocom.org/issues/4335, there appear to be some cards / use cases in which the 512 byte sized ringbuffer is insufficient. As we do have free RAM available, we can easily increase the buffer size, despite not entirely knowing yet why it needs to be *that* large. Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Closes: OS#4335 --- M firmware/libcommon/include/ringbuffer.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/include/ringbuffer.h b/firmware/libcommon/include/ringbuffer.h index a6eddc9..23aaa59 100644 --- a/firmware/libcommon/include/ringbuffer.h +++ b/firmware/libcommon/include/ringbuffer.h @@ -21,7 +21,7 @@ #include #include -#define RING_BUFLEN 512 +#define RING_BUFLEN 1024 typedef struct ringbuf { uint8_t buf[RING_BUFLEN]; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie713d614ec5b334e9058d5d430e4bb660f5b8b69 Gerrit-Change-Number: 16919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:24:14 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Sun, 26 Jan 2020 11:24:14 +0000 Subject: Change in pysim[master]: Added feature to parse Service table based on SIM type. If USIM is pr... In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG at 7 PS1, Line 7: A > Just for clarity: [?] You are right, i didn't think of possibility of having EF.SST and EF.UST at the same time. EF.IST is fine with me as it has a different identifier than EF.SST and EF.UST, but differentiating between EF.SST and EF.UST is a bit confusing. If in a USIM+SIM i want to read the Service table and if i read EF.SST will i get EF.UST or EF:SST (both have the same identifier)? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 11:24:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:27:02 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Sun, 26 Jan 2020 11:27:02 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/16945/5/pySim/cards.py at 81 PS5, Line 81: data = self._scc.read_binary(EF['HPLMNwAcT'], length=None, offset=0) > this doesn't seem to have been adressed yet. oops!! I will address that and re-submit the patch -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Sun, 26 Jan 2020 11:27:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:49:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jan 2020 11:49:08 +0000 Subject: Change in pysim[master]: TEST: Revert "Added feature to read Service Provider Name (SPN) from ... In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/17018 ) Change subject: TEST: Revert "Added feature to read Service Provider Name (SPN) from the SIM card" ...................................................................... Abandoned Let's rather abandon it. I just wanted to confirm that Jenkins verification is broken, and it is. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f256526ad0e7ada11dec2ae4bce3e2bb9ee1914 Gerrit-Change-Number: 17018 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:53:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jan 2020 11:53:17 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Patch Set 2: > Patch Set 1: > > Weird how the IMSI remains the same, but other data read and the card reader nr changes. > print and print() aren't necessarily always equivalent, but I saw only print()s that should be equivalent in this patch. I thought retriggering the run would fix some odd sporadic failure, but neither that. Curious! As it turns out (see previous abandoned commit), Jenkins verification setup is non-deterministic. This failure is a side effect of other changes submitted to Gerrit. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Sun, 26 Jan 2020 11:53:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:55:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jan 2020 11:55:29 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/17005/1//COMMIT_MSG at 2 PS1, Line 2: Pau Espin Pedrol Alexis La Goutte ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 11:55:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 11:56:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jan 2020 11:56:14 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/17017/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/17017/1//COMMIT_MSG at 14 PS1, Line 14: parent_node > I thought parent_node is better. parent_cfg_node might be best. ACK! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 11:56:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 12:02:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jan 2020 12:02:12 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17017 to look at the new patch set (#2). Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() Some osmo-* applications may need to use their own VTY node as a parent for the timer configuration commands. Therefore it makes more sense to use 'int' instead of 'enum node_type'. Let's also clarify that osmo_tdef_vty_groups_init() accepts parent node for configuration commands only: 'parent_node' -> 'parent_cfg_node'. Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c --- M include/osmocom/vty/tdef_vty.h M src/vty/tdef_vty.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/17017/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 12:36:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 12:36:46 +0000 Subject: Change in osmo-ci[master]: ansible/docker: ensure gnupg + crontab are installed References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17020 ) Change subject: ansible/docker: ensure gnupg + crontab are installed ...................................................................... ansible/docker: ensure gnupg + crontab are installed Both are required by docker, but seem to be missing from explicit dpkg 'Requires' :/ TASK [docker : add docker gpg key to apt keyring] ******************************************************** fatal: [rpi4-deb9build-ansible]: FAILED! => {"changed": false, "msg": "Failed to find required executable gpg in paths: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"} TASK [docker : cleanup old docker images] **************************************************************** [WARNING]: The value 0 (type int) in a string field was converted to '0' (type string). If this does not look like what you expect, quote the entire value to ensure it does not change. fatal: [rpi4-deb9build-ansible]: FAILED! => {"changed": false, "msg": "Failed to find required executable crontab in paths: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"} Change-Id: I2d342f85f6bc1b80eaafc7075552019fea147894 --- M ansible/roles/docker/tasks/main.yml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/20/17020/1 diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 0a58a2c..813b5ac 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -2,9 +2,13 @@ - name: add https support apt: - name: apt-transport-https + name: "{{ item }}" cache_valid_time: 3600 update_cache: yes + with_items: + - apt-transport-https + - gnupg + - cron - name: add docker gpg key to apt keyring apt_key: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2d342f85f6bc1b80eaafc7075552019fea147894 Gerrit-Change-Number: 17020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 12:36:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 12:36:46 +0000 Subject: Change in osmo-ci[master]: ansible: Install poky-sdk only on x86_64 architecture References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17021 ) Change subject: ansible: Install poky-sdk only on x86_64 architecture ...................................................................... ansible: Install poky-sdk only on x86_64 architecture The SDK is pre-compiled for a x86_64 host architecture, we cannot use it e.g. on armhf (raspi). Change-Id: Ia565d2dba427c00aa08a4eca62ac7410448ada04 --- M ansible/setup-jenkins-slave.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/17021/1 diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml index 39e6f77..64938c8 100644 --- a/ansible/setup-jenkins-slave.yml +++ b/ansible/setup-jenkins-slave.yml @@ -20,6 +20,7 @@ - docker - name: install-poky-sdk + when: ansible_architecture == "x86_64" jenkins_user: osmocom-build poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4.sh poky_dest: /opt/poky-oc2g/2.3.4/ @@ -27,6 +28,7 @@ - poky - name: install-poky-sdk + when: ansible_architecture == "x86_64" jenkins_user: osmocom-build poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh poky_dest: /opt/poky-sdk/2.3.4/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia565d2dba427c00aa08a4eca62ac7410448ada04 Gerrit-Change-Number: 17021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 13:04:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 13:04:17 +0000 Subject: Change in osmo-ci[master]: Fix ansible playbooks after docker directory was removed here References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17022 ) Change subject: Fix ansible playbooks after docker directory was removed here ...................................................................... Fix ansible playbooks after docker directory was removed here In I30a61aebcadef5536e74edd35e1c75ef77a2da9f, we moved the Dockerfiles from here to docker-playground.git, but failed to adjust the ansible playbook that wants to rebuild those containers during setting up of a build slave. Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Related: OS#4345 Closes: OS#4377 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/17022/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index d002f95..d70d8b6 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -14,6 +14,6 @@ - name: rebuild osmocom docker images for jenkins build tests become: yes become_user: "{{ jenkins_user }}" - shell: ./rebuild_osmocom_jenkins_image.sh + shell: ./scripts/osmo-ci-docker-rebuild.sh args: - chdir: "/home/{{ jenkins_user }}/osmo-ci/docker" + chdir: "/home/{{ jenkins_user }}/osmo-ci" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Gerrit-Change-Number: 17022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jan 26 13:14:33 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jan 2020 13:14:33 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5e2d90cf7d16b_2072acdf78305f0723230@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_9.0/aarch64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 384s] -s: parse and validate only - no TTCN-3 module generation [ 384s] -t: disable the generation of timing information in TTCN-3 modules [ 384s] -v: show version information [ 384s] -w: suppress warnings [ 384s] -x: disable schema validation but generate TTCN-3 modules [ 384s] -z: zap URI scheme from module name [ 384s] Makefile:284: recipe for target 'TitanLoggerApi.ttcn' failed [ 384s] make[4]: *** [TitanLoggerApi.ttcn] Error 1 [ 384s] make[4]: Leaving directory '/usr/src/packages/BUILD/core' [ 384s] ../../Makefile.genrules:60: recipe for target '../../core/RInt.o' failed [ 384s] make[3]: *** [../../core/RInt.o] Error 2 [ 384s] make[3]: Leaving directory '/usr/src/packages/BUILD/mctr2/mctr' [ 384s] Makefile:32: recipe for target 'all' failed [ 384s] make[2]: *** [all] Error 2 [ 384s] make[2]: Leaving directory '/usr/src/packages/BUILD/mctr2' [ 384s] Makefile:65: recipe for target 'all' failed [ 384s] make[1]: *** [all] Error 2 [ 384s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 384s] dh_auto_build: make -j1 returned exit code 2 [ 384s] debian/rules:6: recipe for target 'build' failed [ 384s] make: *** [build] Error 2 [ 384s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 384s] [ 384s] obs-arm-8 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Jan 26 13:14:26 UTC 2020. [ 384s] [ 384s] ### VM INTERACTION START ### [ 387s] [ 376.593235] sysrq: Power Off [ 387s] [ 376.614934] reboot: Power down [ 388s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 26 13:19:59 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jan 2020 13:19:59 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e2d921aa7543_2072acdf78305f07242cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Raspbian_10/armv7l Package network:osmocom:latest/eclipse-titan failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 736s] -h: generate TTCN-3 code allowing type substitution [ 736s] -m: generate only the UsefulTtcn3Types and XSD predefined modules [ 736s] -o: generate all definitions into one module (called XSD_Definitions) [ 736s] -p: do not generate the UsefulTtcn3Types and XSD predefined modules [ 736s] -q: quiet mode - disable the issue of status messages [ 736s] -s: parse and validate only - no TTCN-3 module generation [ 736s] -t: disable the generation of timing information in TTCN-3 modules [ 736s] -v: show version information [ 736s] -w: suppress warnings [ 736s] -x: disable schema validation but generate TTCN-3 modules [ 736s] -z: zap URI scheme from module name [ 736s] make[4]: *** [Makefile:284: TitanLoggerApi.ttcn] Error 1 [ 736s] make[4]: Leaving directory '/usr/src/packages/BUILD/core' [ 736s] make[3]: *** [../../Makefile.genrules:60: ../../core/RInt.o] Error 2 [ 736s] make[3]: Leaving directory '/usr/src/packages/BUILD/mctr2/mctr' [ 736s] make[2]: *** [Makefile:32: all] Error 2 [ 736s] make[2]: Leaving directory '/usr/src/packages/BUILD/mctr2' [ 736s] make[1]: *** [Makefile:65: all] Error 2 [ 736s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 736s] dh_auto_build: make -j1 returned exit code 2 [ 736s] make: *** [debian/rules:6: build] Error 2 [ 736s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 736s] [ 736s] armbuild02 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Jan 26 13:19:52 UTC 2020. [ 736s] [ 736s] ### VM INTERACTION START ### [ 739s] [ 708.282675] sysrq: SysRq : Power Off [ 739s] [ 708.286369] reboot: Power down [ 740s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jan 26 13:23:24 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jan 2020 13:23:24 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5e2d92cf18c3d_2072acdf78305f072467c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_9.0/armv7l Package network:osmocom:latest/eclipse-titan failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 906s] -s: parse and validate only - no TTCN-3 module generation [ 906s] -t: disable the generation of timing information in TTCN-3 modules [ 906s] -v: show version information [ 906s] -w: suppress warnings [ 906s] -x: disable schema validation but generate TTCN-3 modules [ 906s] -z: zap URI scheme from module name [ 906s] Makefile:284: recipe for target 'TitanLoggerApi.ttcn' failed [ 906s] make[4]: *** [TitanLoggerApi.ttcn] Error 1 [ 906s] make[4]: Leaving directory '/usr/src/packages/BUILD/core' [ 906s] ../../Makefile.genrules:60: recipe for target '../../core/RInt.o' failed [ 906s] make[3]: *** [../../core/RInt.o] Error 2 [ 906s] make[3]: Leaving directory '/usr/src/packages/BUILD/mctr2/mctr' [ 906s] Makefile:32: recipe for target 'all' failed [ 906s] make[2]: *** [all] Error 2 [ 906s] make[2]: Leaving directory '/usr/src/packages/BUILD/mctr2' [ 906s] Makefile:65: recipe for target 'all' failed [ 906s] make[1]: *** [all] Error 2 [ 906s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 906s] dh_auto_build: make -j1 returned exit code 2 [ 906s] debian/rules:6: recipe for target 'build' failed [ 906s] make: *** [build] Error 2 [ 906s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 906s] [ 906s] armbuild10 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Jan 26 13:23:18 UTC 2020. [ 906s] [ 906s] ### VM INTERACTION START ### [ 909s] [ 880.794882] sysrq: SysRq : Power Off [ 909s] [ 880.797198] reboot: Power down [ 909s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:05:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:05:27 +0000 Subject: Change in pysim[master]: Added feature to parse Service table based on SIM type. If USIM is pr... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: Added feature to parse Service table based on SIM type. If USIM is present EF.UST service mapping is used else EF.SST service mapping is used ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16991/1//COMMIT_MSG at 7 PS1, Line 7: A > You are right, i didn't think of possibility of having EF.SST and EF.UST at the same time. EF. [?] you cannot just rely on the fileID. You have to take teh entire path into account. The same FileId can exist in every directory (DF), but could have a completely different meaning. In case of files belonging to applications, you have to first select the application by its AID, ... - I'm quite confident sysmo-usim-util is already doing that for sysmoISIM-SJA2 when writing e.g. key material (to ensure the same key is written for SIM, USIM and ISIM). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a33338e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 14:05:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: herlesupreeth Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:21:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:21:08 +0000 Subject: Change in osmo-ci[master]: ansible/docker: ensure gnupg + crontab are installed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17020 ) Change subject: ansible/docker: ensure gnupg + crontab are installed ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2d342f85f6bc1b80eaafc7075552019fea147894 Gerrit-Change-Number: 17020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 14:21:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:21:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:21:17 +0000 Subject: Change in osmo-ci[master]: ansible: Install poky-sdk only on x86_64 architecture In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17021 ) Change subject: ansible: Install poky-sdk only on x86_64 architecture ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia565d2dba427c00aa08a4eca62ac7410448ada04 Gerrit-Change-Number: 17021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 14:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:21:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:21:38 +0000 Subject: Change in osmo-ci[master]: Fix ansible playbooks after docker directory was removed here In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17022 ) Change subject: Fix ansible playbooks after docker directory was removed here ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Gerrit-Change-Number: 17022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Sun, 26 Jan 2020 14:21:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:21:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:21:46 +0000 Subject: Change in osmo-ci[master]: ansible/docker: ensure gnupg + crontab are installed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17020 ) Change subject: ansible/docker: ensure gnupg + crontab are installed ...................................................................... ansible/docker: ensure gnupg + crontab are installed Both are required by docker, but seem to be missing from explicit dpkg 'Requires' :/ TASK [docker : add docker gpg key to apt keyring] ******************************************************** fatal: [rpi4-deb9build-ansible]: FAILED! => {"changed": false, "msg": "Failed to find required executable gpg in paths: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"} TASK [docker : cleanup old docker images] **************************************************************** [WARNING]: The value 0 (type int) in a string field was converted to '0' (type string). If this does not look like what you expect, quote the entire value to ensure it does not change. fatal: [rpi4-deb9build-ansible]: FAILED! => {"changed": false, "msg": "Failed to find required executable crontab in paths: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"} Change-Id: I2d342f85f6bc1b80eaafc7075552019fea147894 --- M ansible/roles/docker/tasks/main.yml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 0a58a2c..813b5ac 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -2,9 +2,13 @@ - name: add https support apt: - name: apt-transport-https + name: "{{ item }}" cache_valid_time: 3600 update_cache: yes + with_items: + - apt-transport-https + - gnupg + - cron - name: add docker gpg key to apt keyring apt_key: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2d342f85f6bc1b80eaafc7075552019fea147894 Gerrit-Change-Number: 17020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:21:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:21:47 +0000 Subject: Change in osmo-ci[master]: ansible: Install poky-sdk only on x86_64 architecture In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17021 ) Change subject: ansible: Install poky-sdk only on x86_64 architecture ...................................................................... ansible: Install poky-sdk only on x86_64 architecture The SDK is pre-compiled for a x86_64 host architecture, we cannot use it e.g. on armhf (raspi). Change-Id: Ia565d2dba427c00aa08a4eca62ac7410448ada04 --- M ansible/setup-jenkins-slave.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml index 39e6f77..64938c8 100644 --- a/ansible/setup-jenkins-slave.yml +++ b/ansible/setup-jenkins-slave.yml @@ -20,6 +20,7 @@ - docker - name: install-poky-sdk + when: ansible_architecture == "x86_64" jenkins_user: osmocom-build poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-cortexa15hf-neon-toolchain-osmo-2.3.4.sh poky_dest: /opt/poky-oc2g/2.3.4/ @@ -27,6 +28,7 @@ - poky - name: install-poky-sdk + when: ansible_architecture == "x86_64" jenkins_user: osmocom-build poky_installer_file: poky-glibc-x86_64-meta-toolchain-osmo-armv5te-toolchain-osmo-2.3.4.sh poky_dest: /opt/poky-sdk/2.3.4/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia565d2dba427c00aa08a4eca62ac7410448ada04 Gerrit-Change-Number: 17021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jan 26 14:22:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jan 2020 14:22:07 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jan 2020 14:22:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 07:50:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 07:50:42 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 07:50:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 07:53:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 07:53:42 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 07:53:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 08:00:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 08:00:31 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 08:00:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 08:37:57 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 27 Jan 2020 08:37:57 +0000 Subject: Change in osmo-ci[master]: Fix ansible playbooks after docker directory was removed here In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17022 ) Change subject: Fix ansible playbooks after docker directory was removed here ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Gerrit-Change-Number: 17022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 27 Jan 2020 08:37:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 08:43:26 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 27 Jan 2020 08:43:26 +0000 Subject: Change in osmo-ci[master]: Fix ansible playbooks after docker directory was removed here In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17022 ) Change subject: Fix ansible playbooks after docker directory was removed here ...................................................................... Fix ansible playbooks after docker directory was removed here In I30a61aebcadef5536e74edd35e1c75ef77a2da9f, we moved the Dockerfiles from here to docker-playground.git, but failed to adjust the ansible playbook that wants to rebuild those containers during setting up of a build slave. Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Related: OS#4345 Closes: OS#4377 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Verified osmith: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index d002f95..d70d8b6 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -14,6 +14,6 @@ - name: rebuild osmocom docker images for jenkins build tests become: yes become_user: "{{ jenkins_user }}" - shell: ./rebuild_osmocom_jenkins_image.sh + shell: ./scripts/osmo-ci-docker-rebuild.sh args: - chdir: "/home/{{ jenkins_user }}/osmo-ci/docker" + chdir: "/home/{{ jenkins_user }}/osmo-ci" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ife64fdaf24107b0b31b8a6d4c78a1df420662ca0 Gerrit-Change-Number: 17022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 09:54:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 09:54:43 +0000 Subject: Change in osmo-msc[master]: VTY: add osmo_tdef introspection and configuration commands In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16932 ) Change subject: VTY: add osmo_tdef introspection and configuration commands ...................................................................... VTY: add osmo_tdef introspection and configuration commands This change introduces several new VTY commands letting the user a possibility to introspect and reconfigure some of the existing timers implemented using libosmocore's osmo_tdef API. At the moment this covers the following timers: - MGW specific timers: - X1 - MGCP response timeout, - X2 - RTP stream establishing timeout, - RAN specific timers (same names for GERAN and UTRAN): - X1 - Authentication and Ciphering timeout, - X2 - RAN connection release sanity timeout, - X3 - Handover procedure timeout. The following commands are introduced: - 'enable' node: - show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] - 'config-msc' node: - timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] Both MNCC and SCCP related timer definitions are empty at the moment. Achieved by using osmo_tdef_group API of libosmovty. Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/msc_common.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M tests/test_nodes.vty 5 files changed, 67 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 7fba1a9..36cbf77 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -576,6 +576,19 @@ + + + + + + + + + + + + + @@ -1392,6 +1405,19 @@ + + + + + + + + + + + + + @@ -2910,6 +2936,20 @@ + + + + + + + + + + + + + + diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index 78337f7..bd85722 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include @@ -7,6 +9,8 @@ struct gsm_network; struct vlr_subscr; +extern struct osmo_tdef_group msc_tdef_group[]; + #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 91b6165..ffb8a3b 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -31,10 +31,25 @@ #include #include +/* TODO: would be great to have all timer declarations in one place */ +#include +#include +#include + struct osmo_tdef mncc_tdefs[] = { {} }; +struct osmo_tdef_group msc_tdef_group[] = { + { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" }, + { .name = "mncc", .tdefs = mncc_tdefs, .desc = "MNCC (Mobile Network Call Control) interface" }, + { .name = "sccp", .tdefs = g_sccp_tdefs, .desc = "SCCP (Signalling Connection Control Part)" }, + { .name = "geran", .tdefs = msc_tdefs_geran, .desc = "GERAN (GSM EDGE Radio Access Network)" }, + { .name = "utran", .tdefs = msc_tdefs_utran, .desc = "UTRAN (UMTS Terrestrial Radio Access Network)" }, + { .name = "sgs", .tdefs = msc_tdefs_sgs, .desc = "SGs interface towards MME" }, + { /* terminator */ } +}; + #include struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv) diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 90cfc9d..53d44dc 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -36,6 +36,7 @@ #include +#include #include #include #include @@ -716,6 +717,9 @@ neighbor_ident_vty_write(vty); + /* Timer introspection commands (generic osmo_tdef API) */ + osmo_tdef_vty_groups_write(vty, " "); + return CMD_SUCCESS; } @@ -2002,6 +2006,9 @@ neighbor_ident_vty_init(msc_network); + /* Timer configuration commands (generic osmo_tdef API) */ + osmo_tdef_vty_groups_init(MSC_NODE, msc_tdef_group); + mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a4e0e15..2c2ce1b 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -69,6 +69,7 @@ neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME + timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 Gerrit-Change-Number: 16932 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 09:54:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 09:54:44 +0000 Subject: Change in osmo-msc[master]: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16933 ) Change subject: libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 ...................................................................... libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 These timers so far were implemented as a list of unsigned integers, which has never been initialized to any reasonable defaults. Since they are used as state timeouts in several FSMs, we might end up staying in some state forever. Let's migrate to generic osmo_tdef API and use default values from table 11.2 of 3GPP TS 24.008. This way the user can introspect and change their values from the VTY / configuration file. Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Related: OS#4368 --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/msc_common.h M include/osmocom/msc/vlr.h M src/libmsc/msc_net_init.c M src/libvlr/vlr.c M tests/test_nodes.vty 6 files changed, 22 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 36cbf77..6418425 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -576,10 +576,11 @@ - + + @@ -1405,10 +1406,11 @@ - + + @@ -2936,9 +2938,10 @@ - + + diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index bd85722..8a43e69 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -10,6 +10,7 @@ struct vlr_subscr; extern struct osmo_tdef_group msc_tdef_group[]; +extern struct osmo_tdef msc_tdefs_vlr[]; #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index d22e3ec..615c6c8 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -252,13 +252,6 @@ int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); }; -enum vlr_timer { - VLR_T_3250, - VLR_T_3260, - VLR_T_3270, - _NUM_VLR_TIMERS -}; - /* An instance of the VLR codebase */ struct vlr_instance { struct llist_head subscribers; @@ -275,7 +268,6 @@ bool auth_reuse_old_sets_on_error; bool parq_retrieve_imsi; bool is_ps; - uint32_t timer[_NUM_VLR_TIMERS]; } cfg; /* A free-form pointer for use by the caller */ void *user_ctx; diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index ffb8a3b..8c8fb86 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -41,6 +41,7 @@ }; struct osmo_tdef_group msc_tdef_group[] = { + { .name = "vlr", .tdefs = msc_tdefs_vlr, .desc = "VLR (Visitors Location Register)" }, { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" }, { .name = "mncc", .tdefs = mncc_tdefs, .desc = "MNCC (Mobile Network Call Control) interface" }, { .name = "sccp", .tdefs = g_sccp_tdefs, .desc = "SCCP (Signalling Connection Control Part)" }, diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index b164fd8..a1489f2 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -61,24 +62,20 @@ { 0, NULL } }; +/* 3GPP TS 24.008, table 11.2 Mobility management timers (network-side) */ +struct osmo_tdef msc_tdefs_vlr[] = { + /* TODO: also define T3212 here */ + { .T = 3250, .default_val = 12, .desc = "TMSI Reallocation procedure" }, + { .T = 3260, .default_val = 12, .desc = "Authentication procedure" }, + { .T = 3270, .default_val = 12, .desc = "Identification procedure" }, + { /* terminator */ } +}; + +/* This is just a wrapper around the osmo_tdef API. + * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) { - uint32_t tidx = 0xffffffff; - - switch (timer) { - case 3270: - tidx = VLR_T_3270; - break; - case 3260: - tidx = VLR_T_3260; - break; - case 3250: - tidx = VLR_T_3250; - break; - } - - OSMO_ASSERT(tidx < sizeof(vlr->cfg.timer)); - return vlr->cfg.timer[tidx]; + return osmo_tdef_get(msc_tdefs_vlr, timer, OSMO_TDEF_S, 0); } /* return static buffer with printable name of VLR subscriber */ diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 2c2ce1b..b87a371 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -69,7 +69,7 @@ neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME - timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] + timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)] mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f Gerrit-Change-Number: 16933 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 12:15:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jan 2020 12:15:30 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 12:15:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 12:15:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jan 2020 12:15:40 +0000 Subject: Change in osmo-msc[master]: libmsc: move subscriber expiration timer T3212 to libvlr In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16934 ) Change subject: libmsc: move subscriber expiration timer T3212 to libvlr ...................................................................... libmsc: move subscriber expiration timer T3212 to libvlr Since the split of OsmoNiTB, OsmoMSC does not deal with the radio access network directly. Therefore the only purpose of T3212 is to control subscriber expiration in the local VLR. The timeout value indicated in System Information Type 3 needs to be configured separately in the BSC/RNC. This means that we don't need to store it in deci-hours anymore. Let's move T3212 to the group of VLR specific timers, so it can be configured and introspected using the generic 'timer' command, and deprecate the old '[no] periodic location update' command. It should be also noted that in the old code subscriber expiration timeout was actually set to twice the T3212 value plus one minute. After this change, we apply the configured value 'as-is', but keep the old behaviour for 'periodic location update' command. Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f --- M doc/manuals/vty/msc_vty_reference.xml M include/osmocom/msc/gsm_data.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/test_nodes.vty M tests/vty_test_runner.py 8 files changed, 54 insertions(+), 69 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml index 6418425..3939c08 100644 --- a/doc/manuals/vty/msc_vty_reference.xml +++ b/doc/manuals/vty/msc_vty_reference.xml @@ -2744,22 +2744,6 @@ - - - - - - - - - - - - - - - - diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 3459d15..2122d4b 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -205,9 +205,6 @@ struct vlr_instance *vlr; - /* Periodic location update default value */ - uint8_t t3212; - /* Global MNCC guard timer value */ int mncc_guard_timeout; /* Global guard timer value for NCSS sessions */ diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 8c8fb86..adb9ca7 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -67,9 +67,6 @@ net->a5_encryption_mask = (1 << 3) | (1 << 1); net->uea_encryption = true; - /* Use 30 min periodic update interval as sane default */ - net->t3212 = 5; - net->mncc_guard_timeout = 180; net->ncss_guard_timeout = 30; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 53d44dc..e2e892a 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -303,32 +303,44 @@ return CMD_SUCCESS; } -DEFUN(cfg_net_per_loc_upd, cfg_net_per_loc_upd_cmd, - "periodic location update <6-1530>", - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval in Minutes\n") +/* NOTE: actually this is subscriber expiration timeout */ +#define PER_LOC_UPD_STR "Periodic Location Updating Interval\n" + +DEFUN_DEPRECATED(cfg_net_per_loc_upd, cfg_net_per_loc_upd_cmd, + "periodic location update <6-1530>", + PER_LOC_UPD_STR PER_LOC_UPD_STR PER_LOC_UPD_STR + "Periodic Location Updating Interval in Minutes\n") { - struct gsm_network *net = vty->index; + int minutes = atoi(argv[0]); + int rc; - net->t3212 = atoi(argv[0]) / 6; + vty_out(vty, "%% 'periodic location update' is now deprecated: " + "use 'timer T3212' to change subscriber expiration " + "timeout.%s", VTY_NEWLINE); - return CMD_SUCCESS; + /* We used to double this value and add a minute when scheduling the + * expiration timer. Let's emulate the old behaviour here. */ + minutes = minutes * 2 + 1; + vty_out(vty, "%% Setting T3212 to %d minutes " + "(emulating the old behaviour).%s", + minutes, VTY_NEWLINE); + + rc = osmo_tdef_set(msc_tdefs_vlr, 3212, minutes, OSMO_TDEF_M); + return rc ? CMD_WARNING : CMD_SUCCESS; } -DEFUN(cfg_net_no_per_loc_upd, cfg_net_no_per_loc_upd_cmd, - "no periodic location update", - NO_STR - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n") +DEFUN_DEPRECATED(cfg_net_no_per_loc_upd, cfg_net_no_per_loc_upd_cmd, + "no periodic location update", + NO_STR PER_LOC_UPD_STR PER_LOC_UPD_STR PER_LOC_UPD_STR) { - struct gsm_network *net = vty->index; + int rc; - net->t3212 = 0; + vty_out(vty, "%% 'periodic location update' is now deprecated: " + "use 'timer T3212' to change subscriber expiration " + "timeout.%s", VTY_NEWLINE); - return CMD_SUCCESS; + rc = osmo_tdef_set(msc_tdefs_vlr, 3212, 0, OSMO_TDEF_M); + return rc ? CMD_WARNING : CMD_SUCCESS; } DEFUN(cfg_net_call_wait, cfg_net_call_wait_cmd, @@ -389,11 +401,6 @@ vty_out(vty, " timezone %d %d%s", gsmnet->tz.hr, gsmnet->tz.mn, VTY_NEWLINE); } - if (gsmnet->t3212 == 0) - vty_out(vty, " no periodic location update%s", VTY_NEWLINE); - else - vty_out(vty, " periodic location update %u%s", - gsmnet->t3212 * 6, VTY_NEWLINE); if (gsmnet->emergency.route_to_msisdn) { vty_out(vty, " emergency-call route-to-msisdn %s%s", @@ -869,7 +876,6 @@ static void vty_dump_one_subscr(struct vty *vty, struct vlr_subscr *vsub, int offset, uint8_t dump_flags) { - struct gsm_network *net; struct timespec now; char buf[128]; @@ -943,9 +949,7 @@ VTY_NEWLINE); } - /* XXX move t3212 into struct vlr_instance? */ - net = vsub->vlr->user_ctx; - if (!net->t3212) { + if (!vlr_timer(vsub->vlr, 3212)) { MSC_VTY_DUMP(vty, offset, "Expires: never (T3212 is disabled)%s", VTY_NEWLINE); } else if (vsub->expire_lu == VLR_SUBSCRIBER_NO_EXPIRATION) { diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index a1489f2..887ceb8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -64,7 +64,7 @@ /* 3GPP TS 24.008, table 11.2 Mobility management timers (network-side) */ struct osmo_tdef msc_tdefs_vlr[] = { - /* TODO: also define T3212 here */ + { .T = 3212, .default_val = 60, .unit = OSMO_TDEF_M, .desc = "Subscriber expiration timeout" }, { .T = 3250, .default_val = 12, .desc = "TMSI Reallocation procedure" }, { .T = 3260, .default_val = 12, .desc = "Authentication procedure" }, { .T = 3270, .default_val = 12, .desc = "Identification procedure" }, @@ -75,6 +75,9 @@ * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) { + /* NOTE: since we usually do not need more than one instance of the VLR, + * and since libosmocore's osmo_tdef API does not (yet) support dynamic + * configuration, we always use the global instance of msc_tdefs_vlr. */ return osmo_tdef_get(msc_tdefs_vlr, timer, OSMO_TDEF_S, 0); } @@ -496,14 +499,11 @@ void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) { - struct gsm_network *net = vsub->vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ struct timespec now; - /* The T3212 timeout value field is coded as the binary representation of the timeout - * value for periodic updating in decihours. Mark the subscriber as inactive if it missed - * two consecutive location updates. Timeout is twice the t3212 value plus one minute. */ + /* Mark the subscriber as inactive if it stopped to do periodical location updates. */ if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) == 0) { - vsub->expire_lu = now.tv_sec + (net->t3212 * 60 * 6 * 2) + 60; + vsub->expire_lu = now.tv_sec + vlr_timer(vsub->vlr, 3212); } else { LOGP(DVLR, LOGL_ERROR, "%s: Could not enable Location Update expiry: unable to read current time\n", vlr_subscr_name(vsub)); @@ -516,13 +516,11 @@ { struct vlr_instance *vlr = data; struct vlr_subscr *vsub, *vsub_tmp; - struct gsm_network *net; struct timespec now; /* Periodic location update might be disabled from the VTY, * so we shall not expire subscribers until explicit IMSI Detach. */ - net = vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ - if (!net->t3212) + if (!vlr_timer(vlr, 3212)) goto done; if (llist_empty(&vlr->subscribers)) @@ -1263,6 +1261,9 @@ /* defaults */ vlr->cfg.assign_tmsi = true; + /* reset shared timer definitions */ + osmo_tdefs_reset(msc_tdefs_vlr); + /* osmo_auth_fsm.c */ OSMO_ASSERT(osmo_fsm_register(&vlr_auth_fsm) == 0); /* osmo_lu_fsm.c */ diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 7b684fe..5d3db69 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -941,7 +941,7 @@ vlr_subscr_put(vsub, __func__); /* Let T3212 (periodic Location update timer) expire */ - fake_time_passes((net->t3212 * 60 * 6 * 2) + 60*4, 0); + fake_time_passes(vlr_timer(net->vlr, 3212) + 60 * 4, 0); /* The subscriber should now be gone. */ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index b87a371..5a81c61 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -24,8 +24,6 @@ timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone - periodic location update <6-1530> - no periodic location update call-waiting no call-waiting @@ -153,7 +151,6 @@ authentication optional rrlp mode none mm info 1 - periodic location update 30 msc mncc guard-timeout 180 ncss guard-timeout 30 diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index f954b5d..2421144 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -198,17 +198,22 @@ self.vty.verify("periodic location update 5", ['% Unknown command.']) self.vty.verify("periodic location update 1531", ['% Unknown command.']) - # Enable periodic lu.. - self.vty.verify("periodic location update 60", ['']) + depr_str = "% 'periodic location update' is now deprecated: " \ + "use 'timer T3212' to change subscriber expiration timeout." + set_str = "% Setting T3212 to 121 minutes (emulating the old behaviour)." + + # Enable periodic LU (deprecated command) + self.vty.verify("periodic location update 60", [depr_str, set_str]) res = self.vty.command("write terminal") - self.assertTrue(res.find('periodic location update 60') > 0) + self.assertTrue(res.find('timer vlr T3212 121') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) self.assertEqual(res.find('no periodic location update'), -1) - # Now disable it.. - self.vty.verify("no periodic location update", ['']) + # Now disable it (deprecated command) + self.vty.verify("no periodic location update", [depr_str]) res = self.vty.command("write terminal") - self.assertEqual(res.find('periodic location update 60'), -1) - self.assertTrue(res.find('no periodic location update') > 0) + self.assertEqual(res.find('no periodic location update'), -1) + self.assertEqual(res.find('timer vlr T3212 121'), -1) def testShowNetwork(self): res = self.vty.command("show network") -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b12066599a7c834a53a93acf5902d91273bc74f Gerrit-Change-Number: 16934 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 13:10:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 13:10:01 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17023 ) Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... libmsc/gsm_04_11.h: remove unused sms_deliver definition This structure is never used in the code, and moreover cannot be used to parse a SUBMIT message correctly at least because: - it is not cross-platform and will only work on LSB machines; - it is not marked as 'packed', so there can be padding; - TP-SRR and TP-RP are swapped (questionable). P.S. 3GPP TS 23.040, section 9.2.2.1 is not clear about the field ordering. In the table listing basic elements [1] they define the present order, while in the layout table [2] it's reversed: [1] TP-MTI, TP-MMS, TP-LP, TP-SRI, TP-UDHI, TP-RP vs [2] TP-MTI, TP-MMS, TP-LP, TP-RP, TP-UDHI, TP-SRI Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca --- M include/osmocom/msc/gsm_04_11.h 1 file changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/17023/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index c504c7f..19aaa3a 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -11,24 +11,6 @@ #define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */ -/* SMS deliver PDU */ -struct sms_deliver { - uint8_t mti:2; /* message type indicator */ - uint8_t mms:1; /* more messages to send */ - uint8_t rp:1; /* reply path */ - uint8_t udhi:1; /* user data header indicator */ - uint8_t sri:1; /* status report indication */ - uint8_t *orig_addr; /* originating address */ - uint8_t pid; /* protocol identifier */ - uint8_t dcs; /* data coding scheme */ - /* service centre time stamp */ - uint8_t ud_len; /* user data length */ - uint8_t *user_data; /* user data */ - - uint8_t msg_ref; /* message reference */ - uint8_t *smsc; -}; - struct gsm_network; struct msgb; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 13:30:41 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jan 2020 13:30:41 +0000 Subject: Change in osmo-asf4-dfu[master]: usb serial number descriptor References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 ) Change subject: usb serial number descriptor ...................................................................... usb serial number descriptor Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da --- M config/usbd_config.h M usb_dfu_main.c M usb_start.c 3 files changed, 116 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/24/17024/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index f82934c..7ae1b05 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -163,7 +163,7 @@ // Enable string descriptor of iSerialNum // usb_dfud_iserialnum_en #ifndef CONF_USB_DFUD_ISERIALNUM_EN -#define CONF_USB_DFUD_ISERIALNUM_EN 0 +#define CONF_USB_DFUD_ISERIALNUM_EN 1 #endif #ifndef CONF_USB_DFUD_ISERIALNUM @@ -175,11 +175,11 @@ // Unicode string of iSerialNum // usb_dfud_iserialnum_str #ifndef CONF_USB_DFUD_ISERIALNUM_STR -#define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF" +#define CONF_USB_DFUD_ISERIALNUM_STR "dummy" #endif #ifndef CONF_USB_DFUD_ISERIALNUM_STR_DESC -#define CONF_USB_DFUD_ISERIALNUM_STR_DESC +#define CONF_USB_DFUD_ISERIALNUM_STR_DESC 12, 0x03, 'd', 0x00, 'u', 0x00, 'm', 0x00, 'm', 0x00, 'y', 0x00, #endif // diff --git a/usb_dfu_main.c b/usb_dfu_main.c index 19fe437..857230d 100644 --- a/usb_dfu_main.c +++ b/usb_dfu_main.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "atmel_start.h" #include "atmel_start_pins.h" @@ -85,10 +86,53 @@ SCB->VTOR = ((uint32_t) application_start_address & SCB_VTOR_TBLOFF_Msk); // re-base the vector table base address asm("bx %0"::"r"(*(application_start_address + 1))); // jump to application Reset Handler in the application */ } +#if defined(SYSMOOCTSIM) +/* Section 9.6 of SAMD5x/E5x Family Data Sheet */ +static int get_chip_unique_serial(uint8_t *out, size_t len) +{ + uint32_t *out32 = (uint32_t *)out; + if (len < 16) + return -EINVAL; + + out32[0] = *(uint32_t *)0x008061fc; + out32[1] = *(uint32_t *)0x00806010; + out32[2] = *(uint32_t *)0x00806014; + out32[3] = *(uint32_t *)0x00806018; + + return 0; +} + +/* same as get_chip_unique_serial but in hex-string format */ +static int get_chip_unique_serial_str(char *out, size_t len) +{ + uint8_t buf[16]; + int rc; + + if (len < 16*2 + 1) + return -EINVAL; + + rc = get_chip_unique_serial(buf, sizeof(buf)); + if (rc < 0) + return rc; + for(int i = 0; i < sizeof(buf); i++) + sprintf(&out[i*2], "%02x", buf[i]); + return 0; +} +char sernr_buf[16*2+1]; +//unicode for descriptor +uint8_t sernr_buf_descr[1+1+16*2*2]; +#endif int main(void) { atmel_start_init(); // initialise system +#if defined(SYSMOOCTSIM) + get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); + sernr_buf_descr[0] = sizeof(sernr_buf_descr); + sernr_buf_descr[1] = 0x3; + for(int i= 2; i < sizeof(sernr_buf_descr); i+=2) + sernr_buf_descr[i] = sernr_buf[i >> 1]; +#endif if (!check_bootloader()) { // check bootloader // blink the LED to tell the user we don't know where the application starts while (true) { diff --git a/usb_start.c b/usb_start.c index 93059ad..24cde4f 100644 --- a/usb_start.c +++ b/usb_start.c @@ -17,6 +17,7 @@ */ #include "atmel_start.h" #include "usb_start.h" +#include "config/usbd_config.h" #if CONF_USBD_HS_SP static uint8_t single_desc_bytes[] = { @@ -45,6 +46,71 @@ /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; + + +/* transmit given string descriptor */ +static bool send_str_desc(uint8_t ep, const struct usb_req *req, enum usb_ctrl_stage stage, + const uint8_t *desc) +{ + uint16_t len_req = LE16(req->wLength); + uint16_t len_desc = desc[0]; + uint16_t len_tx; + bool need_zlp = !(len_req & (CONF_USB_DFUD_BMAXPKSZ0 - 1)); + + if (len_req <= len_desc) { + need_zlp = false; + len_tx = len_req; + } else { + len_tx = len_desc; + } + + if (ERR_NONE != usbdc_xfer(ep, (uint8_t *)desc, len_tx, need_zlp)) { + return true; + } + + return false; +} + +extern uint8_t sernr_buf_descr[]; +/* call-back for every control EP request */ +static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + uint8_t index, type; + + if (stage != USB_SETUP_STAGE) + return ERR_NOT_FOUND; + + if ((req->bmRequestType & (USB_REQT_TYPE_MASK | USB_REQT_DIR_IN)) != + (USB_REQT_TYPE_STANDARD | USB_REQT_DIR_IN)) + return ERR_NOT_FOUND; + + /* abort if it's not a GET DESCRIPTOR request */ + if (req->bRequest != USB_REQ_GET_DESC) + return ERR_NOT_FOUND; + + /* abort if it's not about a string descriptor */ + type = req->wValue >> 8; + if (type != USB_DT_STRING) + return ERR_NOT_FOUND; +#if 0 + printf("ep=%02x, bmReqT=%04x, bReq=%02x, wValue=%04x, stage=%d\r\n", + ep, req->bmRequestType, req->bRequest, req->wValue, stage); +#endif + /* abort if it's not a standard GET request */ + index = req->wValue & 0x00FF; + switch (index) { + case CONF_USB_DFUD_ISERIALNUM: + return send_str_desc(ep, req, stage, sernr_buf_descr); + default: + return ERR_NOT_FOUND; + } +} + + +static struct usbdc_handler string_req_h = {NULL, (FUNC_PTR)string_req_cb}; + + + /** * \brief USB DFU Init */ @@ -52,6 +118,9 @@ { usbdc_init(ctrl_buffer); dfudf_init(); +#if defined(SYSMOOCTSIM) + usbdc_register_handler(USBDC_HDL_REQ, &string_req_h); +#endif usbdc_start(single_desc); usbdc_attach(); -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da Gerrit-Change-Number: 17024 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 13:32:44 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jan 2020 13:32:44 +0000 Subject: Change in osmo-ccid-firmware[laforge/dfurt]: support DFU detach to switch from fw to bootloader References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17027 ) Change subject: support DFU detach to switch from fw to bootloader ...................................................................... support DFU detach to switch from fw to bootloader This makes flashing a bit more convenient, because pushing the button is not required. It can be disabled using make DISABLE_DFU_DETACH=1. Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 --- M sysmoOCTSIM/dfu_descriptors.h M sysmoOCTSIM/gcc/Makefile A sysmoOCTSIM/usb/class/dfu/device/dfudf.c A sysmoOCTSIM/usb/class/dfu/device/dfudf.h A sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h A sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_start.c M sysmoOCTSIM/usb_start.h 8 files changed, 653 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/27/17027/1 diff --git a/sysmoOCTSIM/dfu_descriptors.h b/sysmoOCTSIM/dfu_descriptors.h index 8cbaf23..853a98b 100644 --- a/sysmoOCTSIM/dfu_descriptors.h +++ b/sysmoOCTSIM/dfu_descriptors.h @@ -10,8 +10,8 @@ #define DFU_FUNC_DESC { \ .bLength = USB_DT_DFU_SIZE, \ .bDescriptorType = USB_DT_DFU, \ - .bmAttributes = USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \ - .wDetachTimeOut = 5000, \ + .bmAttributes = USB_DFU_WILL_DETACH, \ + .wDetachTimeOut = 0, \ .wTransferSize = FLASH_PAGE_SIZE, \ .bcdDFUVersion = 0x0100, \ } diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 6c0974f..9df0c01 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -7,9 +7,11 @@ EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- +DISABLE_DFU_DETACH ?= 0 + CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD + -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld @@ -75,6 +77,8 @@ -I"../usb/class/ccid/device" \ -I"../usb/class/cdc" \ -I"../usb/class/cdc/device" \ + -I"../usb/class/dfu" \ + -I"../usb/class/dfu/device" \ -I"../usb/device" \ $(NULL) @@ -135,6 +139,7 @@ talloc.o \ usb/class/ccid/device/ccid_df.o \ usb/class/cdc/device/cdcdf_acm.o \ + usb/class/dfu/device/dfudf.o \ usb/device/usbdc.o \ usb/usb_protocol.o \ usb_descriptors.o \ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c new file mode 100644 index 0000000..2b11fb4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -0,0 +1,300 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Implementation. + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "dfudf.h" +#include "usb_protocol_dfu.h" +#include "dfudf_desc.h" + +/** USB Device DFU Function Specific Data */ +struct dfudf_func_data { + /** DFU Interface information */ + uint8_t func_iface; + /** DFU Enable Flag */ + bool enabled; +}; + +static struct usbdf_driver _dfudf; +static struct dfudf_func_data _dfudf_funcd; + +/** USB DFU functional descriptor (with DFU attributes) */ +static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB}; +static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes; + +enum usb_dfu_state dfu_state = USB_DFU_STATE_APP_IDLE; +enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; + +uint8_t dfu_download_data[512]; +uint16_t dfu_download_length = 0; +size_t dfu_download_offset = 0; +bool dfu_manifestation_complete = false; + +/** + * \brief Enable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB interface descriptor + * \return Operation status. + */ +static int32_t dfudf_enable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + uint8_t * ifc; + + ifc = desc->sod; + if (NULL == ifc) { + return ERR_NOT_FOUND; + } + + ifc_desc.bInterfaceNumber = ifc[2]; + ifc_desc.bInterfaceClass = ifc[5]; + + if (USB_DFU_CLASS == ifc_desc.bInterfaceClass) { + if (func_data->func_iface == ifc_desc.bInterfaceNumber) { // Initialized + return ERR_ALREADY_INITIALIZED; + } else if (func_data->func_iface != 0xFF) { // Occupied + return ERR_NO_RESOURCE; + } else { + func_data->func_iface = ifc_desc.bInterfaceNumber; + } + } else { // Not supported by this function driver + return ERR_NOT_FOUND; + } + + // there are no endpoint to install since DFU uses only the control endpoint + + ifc = usb_find_desc(usb_desc_next(desc->sod), desc->eod, USB_DT_INTERFACE); + + // Installed + _dfudf_funcd.enabled = true; + return ERR_NONE; +} + +/** + * \brief Disable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB device descriptor + * \return Operation status. + */ +static int32_t dfudf_disable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + + if (desc) { + ifc_desc.bInterfaceClass = desc->sod[5]; + // Check interface + if (ifc_desc.bInterfaceClass != USB_DFU_CLASS) { + return ERR_NOT_FOUND; + } + } + + func_data->func_iface = 0xFF; + + _dfudf_funcd.enabled = false; + return ERR_NONE; +} + +/** + * \brief DFU Control Function + * \param[in] drv Pointer to USB device function driver + * \param[in] ctrl USB device general function control type + * \param[in] param Parameter pointer + * \return Operation status. + */ +static int32_t dfudf_ctrl(struct usbdf_driver *drv, enum usbdf_control ctrl, void *param) +{ + switch (ctrl) { + case USBDF_ENABLE: + return dfudf_enable(drv, (struct usbd_descriptors *)param); + + case USBDF_DISABLE: + return dfudf_disable(drv, (struct usbd_descriptors *)param); + + case USBDF_GET_IFACE: + return ERR_UNSUPPORTED_OP; + + default: + return ERR_INVALID_ARG; + } +} + +/** + * \brief Process the DFU IN request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_in_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (USB_DATA_STAGE == stage) { // the data stage is only for IN data, which we sent + return ERR_NONE; // send the IN data + } + + int32_t to_return = ERR_NONE; + uint8_t response[6]; // buffer for the response to this request + switch (req->bRequest) { + case USB_DFU_UPLOAD: // upload firmware from flash not supported + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) + break; + case USB_DFU_GETSTATUS: // get status + response[0] = dfu_status; // set status + response[1] = 10; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[2] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[3] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[4] = dfu_state; // set state + response[5] = 0; // string not used + to_return = usbdc_xfer(ep, response, 6, false); // send back status + if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) { // download has not completed + dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state + } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { + if (!dfu_manifestation_complete) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode + } else if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { + dfu_state = USB_DFU_STATE_DFU_IDLE; // go back to idle mode + } else { // this should not happen (after manifestation the state should be dfuMANIFEST-WAIT-RESET if we are not manifest tolerant) + dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; // wait for reset + } + } + break; + case USB_DFU_GETSTATE: // get state + response[0] = dfu_state; // return state + to_return = usbdc_xfer(ep, response, 1, false); // send back state + break; + default: // all other DFU class IN request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the DFU OUT request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_out_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + int32_t to_return = ERR_NONE; + switch (req->bRequest) { + case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode +#if (DISABLE_DFU_DETACH != 0) + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) +#else + to_return = usbdc_xfer(ep, NULL, 0, false); + *(uint32_t*)HSRAM_ADDR = 0x44465521; + __disable_irq(); + delay_us(10000); + usbdc_detach(); + delay_us(100000); + NVIC_SystemReset(); +#endif + break; + case USB_DFU_CLRSTATUS: // clear status + if (USB_DFU_STATE_DFU_ERROR == dfu_state || USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error + dfu_status = USB_DFU_STATUS_OK; // clear error status + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state + } + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + case USB_DFU_ABORT: // abort current operation + dfu_download_offset = 0; // reset download progress + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + default: // all other DFU class OUT request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the CDC class request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request + return ERR_NOT_FOUND; + } + + if ((req->wIndex == _dfudf_funcd.func_iface)) { + if (req->bmRequestType & USB_EP_DIR_IN) { + return dfudf_in_req(ep, req, stage); + } else { + return dfudf_out_req(ep, req, stage); + } + } else { + return ERR_NOT_FOUND; + } + return ERR_NOT_FOUND; +} + +/** USB Device DFU Handler Struct */ +static struct usbdc_handler dfudf_req_h = {NULL, (FUNC_PTR)dfudf_req}; + +/** + * \brief Initialize the USB DFU Function Driver + */ +int32_t dfudf_init(void) +{ + if (usbdc_get_state() > USBD_S_POWER) { + return ERR_DENIED; + } + + _dfudf.ctrl = dfudf_ctrl; + _dfudf.func_data = &_dfudf_funcd; + + usbdc_register_function(&_dfudf); + usbdc_register_handler(USBDC_HDL_REQ, &dfudf_req_h); + + return ERR_NONE; +} + +/** + * \brief De-initialize the USB DFU Function Driver + */ +void dfudf_deinit(void) +{ +} + +/** + * \brief Check whether DFU Function is enabled + */ +bool dfudf_is_enabled(void) +{ + return _dfudf_funcd.enabled; +} diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h new file mode 100644 index 0000000..cee5845 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h @@ -0,0 +1,77 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Definition. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_H_ +#define USBDF_DFU_H_ + +#include "usbdc.h" +#include "usb_protocol_dfu.h" + +/** Current DFU state */ +extern enum usb_dfu_state dfu_state; +/**< Current DFU status */ +extern enum usb_dfu_status dfu_status; + +/** Downloaded data to be programmed in flash + * + * 512 is the flash page size of the SAM D5x/E5x + */ +extern uint8_t dfu_download_data[512]; +/** Length of downloaded data in bytes */ +extern uint16_t dfu_download_length; +/** Offset of where the downloaded data should be flashed in bytes */ +extern size_t dfu_download_offset; +/** If manifestation (firmware flash and check) is complete */ +extern bool dfu_manifestation_complete; + +/** + * \brief Initialize the USB DFU Function Driver + * \return Operation status. + */ +int32_t dfudf_init(void); + +/** + * \brief Deinitialize the USB DFU Function Driver + * \return Operation status. + */ +void dfudf_deinit(void); + +/** + * \brief Check whether DFU Function is enabled + * \return Operation status. + * \return true DFU Function is enabled + * \return false DFU Function is disabled + */ +bool dfudf_is_enabled(void); + +#endif /* USBDF_DFU_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h new file mode 100644 index 0000000..50a79e4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h @@ -0,0 +1,114 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Descriptor Setting. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_DESC_H_ +#define USBDF_DFU_DESC_H_ + +#include "usb_protocol.h" +#include "usbd_config.h" +#include "usb_protocol_dfu.h" + +#define DFUD_DEV_DESC \ + USB_DEV_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BDEVICEPROTOCOL, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_OPENMOKO_IDVENDOR, \ + CONF_USB_OSMOASF4DFU_IDPRODUCT, \ + CONF_USB_DFUD_BCDDEVICE, \ + CONF_USB_DFUD_IMANUFACT, \ + CONF_USB_DFUD_IPRODUCT, \ + CONF_USB_DFUD_ISERIALNUM, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_DEV_QUAL_DESC \ + USB_DEV_QUAL_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_CFG_DESC \ + USB_CONFIG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_OTH_SPD_CFG_DESC \ + USB_OTH_SPD_CFG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_IFACE_DESCB USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ + 0, /**< detaching makes only sense in run-time mode */ \ + 512, /**< transfer size corresponds to page size for optimal flash writing */ \ + 0x0110 /**< DFU specification version 1.1 used */ ) + +#define DFUD_IFACE_DESCES \ + USB_IFACE_DESC_BYTES(CONF_USB_DFUD_BIFCNUM, \ + CONF_USB_DFUD_BALTSET, \ + CONF_USB_DFUD_BNUMEP, \ + USB_DFU_CLASS, \ + USB_DFU_SUBCLASS, \ + USB_DFU_PROTOCOL_DFU, \ + CONF_USB_DFUD_IINTERFACE), \ + DFUD_IFACE_DESCB + +#define DFUD_STR_DESCES \ + CONF_USB_DFUD_LANGID_DESC \ + CONF_USB_DFUD_IMANUFACT_STR_DESC \ + CONF_USB_DFUD_IPRODUCT_STR_DESC \ + CONF_USB_DFUD_ISERIALNUM_STR_DESC \ + CONF_USB_DFUD_ICONFIG_STR_DESC \ + CONF_USB_DFUD_IINTERFACE_STR_DESC + +/** USB Device descriptors and configuration descriptors */ +#define DFUD_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_DEV_QUAL_DESC, DFUD_CFG_DESC, DFUD_M_IFACE_DESCES, \ + DFUD_IFACE_DESCES, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES_HS, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_HS \ + DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_IFACE_DESCES_HS, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES + +#endif /* USBDF_DFU_DESC_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h new file mode 100644 index 0000000..7f82743 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h @@ -0,0 +1,150 @@ +/** + * \file + * + * \brief USB Device Firmware Upgrade (DFU) protocol definitions + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef _USB_PROTOCOL_DFU_H_ +#define _USB_PROTOCOL_DFU_H_ + +#include "usb_includes.h" + +/* + * \ingroup usb_protocol_group + * \defgroup dfu_protocol_group Device Firmware Upgrade Definitions + * \implements USB Device Firmware Upgrade Specification, Revision 1.1 + * @{ + */ + +/** + * \name USB DFU Subclass IDs + */ +//@{ +#define USB_DFU_CLASS 0xFE //!< Application Specific Class Code +//@} + +//! \name USB DFU Subclass IDs +//@{ +#define USB_DFU_SUBCLASS 0x01 //!< Device Firmware Upgrade Code +//@} + +//! \name USB DFU Protocol IDs +//@{ +#define USB_DFU_PROTOCOL_RUNTIME 0x01 //!< Runtime protocol +#define USB_DFU_PROTOCOL_DFU 0x02 //!< DFU mode protocol +//@} + +//! \name USB DFU Attributes bits mask +//@{ +#define USB_DFU_ATTRIBUTES_CAN_DOWNLOAD 0x01 +#define USB_DFU_ATTRIBUTES_CAN_UPLOAD 0x02 +#define USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT 0x04 +#define USB_DFU_ATTRIBUTES_WILL_DETACH 0x08 +//@} + +//! \name USB DFU Request IDs +//@{ +#define USB_REQ_DFU_DETACH 0x00 +#define USB_REQ_DFU_DNLOAD 0x01 +#define USB_REQ_DFU_UPLOAD 0x02 +#define USB_REQ_DFU_GETSTATUS 0x03 +#define USB_REQ_DFU_CLRSTATUS 0x04 +#define USB_REQ_DFU_GETSTATE 0x05 +#define USB_REQ_DFU_ABORT 0x06 +//@} + +/* + * Need to pack structures tightly, or the compiler might insert padding + * and violate the spec-mandated layout. + */ +COMPILER_PACK_SET(1) + +//! \name USB DFU Descriptors +//@{ + +//! DFU Functional Descriptor +typedef struct usb_dfu_func_desc { + uint8_t bFunctionLength; /**< Size of this descriptor, in bytes (always 9) */ + uint8_t bDescriptorType; /**< DFU FUNCTIONAL descriptor type (always 0x21) */ + uint8_t bmAttributes; /**< DFU attributes bit mask */ + le16_t wDetachTimeOut; /**< Time, in milliseconds, that the device will wait after receipt of the DFU_DETACH request */ + le16_t wTransferSize; /**< Maximum number of bytes that the device can accept per control-write transaction */ + le16_t bcdDFUVersion; /**< Numeric expression identifying the version of the DFU Specification release */ +} usb_dfu_func_desc_t; + +#define USB_DFU_FUNC_DESC_LEN 9 +#define USB_DFU_FUNC_DESC_TYPE 0x21 +#define USB_DFU_FUNC_DESC_BYTES(bmAttributes, wDetachTimeOut, wTransferSize, bcdDFUVersion) \ + USB_DFU_FUNC_DESC_LEN, /* bFunctionLength */ \ + USB_DFU_FUNC_DESC_TYPE, /* bDescriptorType */ \ + bmAttributes, \ + LE_BYTE0(wDetachTimeOut), LE_BYTE1(wDetachTimeOut), \ + LE_BYTE0(wTransferSize), LE_BYTE1(wTransferSize), \ + LE_BYTE0(bcdDFUVersion), LE_BYTE1(bcdDFUVersion) + +COMPILER_PACK_RESET() + +//! @} + +//! USB DFU Request IDs +enum usb_dfu_req { + USB_DFU_DETACH, + USB_DFU_DNLOAD, + USB_DFU_UPLOAD, + USB_DFU_GETSTATUS, + USB_DFU_CLRSTATUS, + USB_DFU_GETSTATE, + USB_DFU_ABORT, +}; + +//! USB DFU Device Status IDs +enum usb_dfu_status { + USB_DFU_STATUS_OK, + USB_DFU_STATUS_ERR_TARGET, + USB_DFU_STATUS_ERR_FILE, + USB_DFU_STATUS_ERR_WRITE, + USB_DFU_STATUS_ERR_ERASE, + USB_DFU_STATUS_ERR_CHECK_ERASED, + USB_DFU_STATUS_ERR_PROG, + USB_DFU_STATUS_ERR_VERIFY, + USB_DFU_STATUS_ERR_ADDRESS, + USB_DFU_STATUS_ERR_NOTDONE, + USB_DFU_STATUS_ERR_FIRMWARE, + USB_DFU_STATUS_ERR_VENDOR, + USB_DFU_STATUS_ERR_USBR, + USB_DFU_STATUS_ERR_POR, + USB_DFU_STATUS_ERR_UNKNOWN, + USB_DFU_STATUS_ERR_STALLEDPKT, +}; + +//! USB DFU Device State IDs +enum usb_dfu_state { + USB_DFU_STATE_APP_IDLE, + USB_DFU_STATE_APP_DETACH, + USB_DFU_STATE_DFU_IDLE, + USB_DFU_STATE_DFU_DNLOAD_SYNC, + USB_DFU_STATE_DFU_DNBUSY, + USB_DFU_STATE_DFU_DNLOAD_IDLE, + USB_DFU_STATE_DFU_MANIFEST_SYNC, + USB_DFU_STATE_DFU_MANIFEST, + USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET, + USB_DFU_STATE_DFU_UPLOAD_IDLE, + USB_DFU_STATE_DFU_ERROR, +}; + +#endif // _USB_PROTOCOL_DFU_H_ diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index 1c1672c..f737dc4 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -138,6 +138,8 @@ /* usbdc_register_funcion inside */ cdcdf_acm_init(); + dfudf_init(); + printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod); usbdc_start((struct usbd_descriptors *) usb_descs); usbdc_attach(); diff --git a/sysmoOCTSIM/usb_start.h b/sysmoOCTSIM/usb_start.h index a99d1ad..089c58d 100644 --- a/sysmoOCTSIM/usb_start.h +++ b/sysmoOCTSIM/usb_start.h @@ -15,6 +15,8 @@ #include "cdcdf_acm.h" #include "cdcdf_acm_desc.h" #include "ccid_df.h" +#include "dfudf.h" +#include "dfudf_desc.h" void usb_start(void); void cdc_device_acm_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: laforge/dfurt Gerrit-Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 Gerrit-Change-Number: 17027 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 13:33:59 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jan 2020 13:33:59 +0000 Subject: Change in osmo-ccid-firmware[laforge/dfurt]: support DFU detach to switch from fw to bootloader In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17027 ) Change subject: support DFU detach to switch from fw to bootloader ...................................................................... support DFU detach to switch from fw to bootloader This makes flashing a bit more convenient, because pushing the button is not required. It can be disabled using make DISABLE_DFU_DETACH=1. Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 --- M sysmoOCTSIM/dfu_descriptors.h M sysmoOCTSIM/gcc/Makefile A sysmoOCTSIM/usb/class/dfu/device/dfudf.c A sysmoOCTSIM/usb/class/dfu/device/dfudf.h A sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h A sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_start.c M sysmoOCTSIM/usb_start.h 8 files changed, 653 insertions(+), 3 deletions(-) Objections: Jenkins Builder: Fails diff --git a/sysmoOCTSIM/dfu_descriptors.h b/sysmoOCTSIM/dfu_descriptors.h index 8cbaf23..853a98b 100644 --- a/sysmoOCTSIM/dfu_descriptors.h +++ b/sysmoOCTSIM/dfu_descriptors.h @@ -10,8 +10,8 @@ #define DFU_FUNC_DESC { \ .bLength = USB_DT_DFU_SIZE, \ .bDescriptorType = USB_DT_DFU, \ - .bmAttributes = USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \ - .wDetachTimeOut = 5000, \ + .bmAttributes = USB_DFU_WILL_DETACH, \ + .wDetachTimeOut = 0, \ .wTransferSize = FLASH_PAGE_SIZE, \ .bcdDFUVersion = 0x0100, \ } diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 6c0974f..9df0c01 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -7,9 +7,11 @@ EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- +DISABLE_DFU_DETACH ?= 0 + CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD + -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld @@ -75,6 +77,8 @@ -I"../usb/class/ccid/device" \ -I"../usb/class/cdc" \ -I"../usb/class/cdc/device" \ + -I"../usb/class/dfu" \ + -I"../usb/class/dfu/device" \ -I"../usb/device" \ $(NULL) @@ -135,6 +139,7 @@ talloc.o \ usb/class/ccid/device/ccid_df.o \ usb/class/cdc/device/cdcdf_acm.o \ + usb/class/dfu/device/dfudf.o \ usb/device/usbdc.o \ usb/usb_protocol.o \ usb_descriptors.o \ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c new file mode 100644 index 0000000..2b11fb4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -0,0 +1,300 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Implementation. + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "dfudf.h" +#include "usb_protocol_dfu.h" +#include "dfudf_desc.h" + +/** USB Device DFU Function Specific Data */ +struct dfudf_func_data { + /** DFU Interface information */ + uint8_t func_iface; + /** DFU Enable Flag */ + bool enabled; +}; + +static struct usbdf_driver _dfudf; +static struct dfudf_func_data _dfudf_funcd; + +/** USB DFU functional descriptor (with DFU attributes) */ +static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB}; +static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes; + +enum usb_dfu_state dfu_state = USB_DFU_STATE_APP_IDLE; +enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; + +uint8_t dfu_download_data[512]; +uint16_t dfu_download_length = 0; +size_t dfu_download_offset = 0; +bool dfu_manifestation_complete = false; + +/** + * \brief Enable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB interface descriptor + * \return Operation status. + */ +static int32_t dfudf_enable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + uint8_t * ifc; + + ifc = desc->sod; + if (NULL == ifc) { + return ERR_NOT_FOUND; + } + + ifc_desc.bInterfaceNumber = ifc[2]; + ifc_desc.bInterfaceClass = ifc[5]; + + if (USB_DFU_CLASS == ifc_desc.bInterfaceClass) { + if (func_data->func_iface == ifc_desc.bInterfaceNumber) { // Initialized + return ERR_ALREADY_INITIALIZED; + } else if (func_data->func_iface != 0xFF) { // Occupied + return ERR_NO_RESOURCE; + } else { + func_data->func_iface = ifc_desc.bInterfaceNumber; + } + } else { // Not supported by this function driver + return ERR_NOT_FOUND; + } + + // there are no endpoint to install since DFU uses only the control endpoint + + ifc = usb_find_desc(usb_desc_next(desc->sod), desc->eod, USB_DT_INTERFACE); + + // Installed + _dfudf_funcd.enabled = true; + return ERR_NONE; +} + +/** + * \brief Disable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB device descriptor + * \return Operation status. + */ +static int32_t dfudf_disable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + + if (desc) { + ifc_desc.bInterfaceClass = desc->sod[5]; + // Check interface + if (ifc_desc.bInterfaceClass != USB_DFU_CLASS) { + return ERR_NOT_FOUND; + } + } + + func_data->func_iface = 0xFF; + + _dfudf_funcd.enabled = false; + return ERR_NONE; +} + +/** + * \brief DFU Control Function + * \param[in] drv Pointer to USB device function driver + * \param[in] ctrl USB device general function control type + * \param[in] param Parameter pointer + * \return Operation status. + */ +static int32_t dfudf_ctrl(struct usbdf_driver *drv, enum usbdf_control ctrl, void *param) +{ + switch (ctrl) { + case USBDF_ENABLE: + return dfudf_enable(drv, (struct usbd_descriptors *)param); + + case USBDF_DISABLE: + return dfudf_disable(drv, (struct usbd_descriptors *)param); + + case USBDF_GET_IFACE: + return ERR_UNSUPPORTED_OP; + + default: + return ERR_INVALID_ARG; + } +} + +/** + * \brief Process the DFU IN request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_in_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (USB_DATA_STAGE == stage) { // the data stage is only for IN data, which we sent + return ERR_NONE; // send the IN data + } + + int32_t to_return = ERR_NONE; + uint8_t response[6]; // buffer for the response to this request + switch (req->bRequest) { + case USB_DFU_UPLOAD: // upload firmware from flash not supported + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) + break; + case USB_DFU_GETSTATUS: // get status + response[0] = dfu_status; // set status + response[1] = 10; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[2] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[3] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[4] = dfu_state; // set state + response[5] = 0; // string not used + to_return = usbdc_xfer(ep, response, 6, false); // send back status + if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) { // download has not completed + dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state + } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { + if (!dfu_manifestation_complete) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode + } else if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { + dfu_state = USB_DFU_STATE_DFU_IDLE; // go back to idle mode + } else { // this should not happen (after manifestation the state should be dfuMANIFEST-WAIT-RESET if we are not manifest tolerant) + dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; // wait for reset + } + } + break; + case USB_DFU_GETSTATE: // get state + response[0] = dfu_state; // return state + to_return = usbdc_xfer(ep, response, 1, false); // send back state + break; + default: // all other DFU class IN request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the DFU OUT request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_out_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + int32_t to_return = ERR_NONE; + switch (req->bRequest) { + case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode +#if (DISABLE_DFU_DETACH != 0) + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) +#else + to_return = usbdc_xfer(ep, NULL, 0, false); + *(uint32_t*)HSRAM_ADDR = 0x44465521; + __disable_irq(); + delay_us(10000); + usbdc_detach(); + delay_us(100000); + NVIC_SystemReset(); +#endif + break; + case USB_DFU_CLRSTATUS: // clear status + if (USB_DFU_STATE_DFU_ERROR == dfu_state || USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error + dfu_status = USB_DFU_STATUS_OK; // clear error status + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state + } + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + case USB_DFU_ABORT: // abort current operation + dfu_download_offset = 0; // reset download progress + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + default: // all other DFU class OUT request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the CDC class request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request + return ERR_NOT_FOUND; + } + + if ((req->wIndex == _dfudf_funcd.func_iface)) { + if (req->bmRequestType & USB_EP_DIR_IN) { + return dfudf_in_req(ep, req, stage); + } else { + return dfudf_out_req(ep, req, stage); + } + } else { + return ERR_NOT_FOUND; + } + return ERR_NOT_FOUND; +} + +/** USB Device DFU Handler Struct */ +static struct usbdc_handler dfudf_req_h = {NULL, (FUNC_PTR)dfudf_req}; + +/** + * \brief Initialize the USB DFU Function Driver + */ +int32_t dfudf_init(void) +{ + if (usbdc_get_state() > USBD_S_POWER) { + return ERR_DENIED; + } + + _dfudf.ctrl = dfudf_ctrl; + _dfudf.func_data = &_dfudf_funcd; + + usbdc_register_function(&_dfudf); + usbdc_register_handler(USBDC_HDL_REQ, &dfudf_req_h); + + return ERR_NONE; +} + +/** + * \brief De-initialize the USB DFU Function Driver + */ +void dfudf_deinit(void) +{ +} + +/** + * \brief Check whether DFU Function is enabled + */ +bool dfudf_is_enabled(void) +{ + return _dfudf_funcd.enabled; +} diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h new file mode 100644 index 0000000..cee5845 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h @@ -0,0 +1,77 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Definition. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_H_ +#define USBDF_DFU_H_ + +#include "usbdc.h" +#include "usb_protocol_dfu.h" + +/** Current DFU state */ +extern enum usb_dfu_state dfu_state; +/**< Current DFU status */ +extern enum usb_dfu_status dfu_status; + +/** Downloaded data to be programmed in flash + * + * 512 is the flash page size of the SAM D5x/E5x + */ +extern uint8_t dfu_download_data[512]; +/** Length of downloaded data in bytes */ +extern uint16_t dfu_download_length; +/** Offset of where the downloaded data should be flashed in bytes */ +extern size_t dfu_download_offset; +/** If manifestation (firmware flash and check) is complete */ +extern bool dfu_manifestation_complete; + +/** + * \brief Initialize the USB DFU Function Driver + * \return Operation status. + */ +int32_t dfudf_init(void); + +/** + * \brief Deinitialize the USB DFU Function Driver + * \return Operation status. + */ +void dfudf_deinit(void); + +/** + * \brief Check whether DFU Function is enabled + * \return Operation status. + * \return true DFU Function is enabled + * \return false DFU Function is disabled + */ +bool dfudf_is_enabled(void); + +#endif /* USBDF_DFU_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h new file mode 100644 index 0000000..50a79e4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h @@ -0,0 +1,114 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Descriptor Setting. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_DESC_H_ +#define USBDF_DFU_DESC_H_ + +#include "usb_protocol.h" +#include "usbd_config.h" +#include "usb_protocol_dfu.h" + +#define DFUD_DEV_DESC \ + USB_DEV_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BDEVICEPROTOCOL, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_OPENMOKO_IDVENDOR, \ + CONF_USB_OSMOASF4DFU_IDPRODUCT, \ + CONF_USB_DFUD_BCDDEVICE, \ + CONF_USB_DFUD_IMANUFACT, \ + CONF_USB_DFUD_IPRODUCT, \ + CONF_USB_DFUD_ISERIALNUM, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_DEV_QUAL_DESC \ + USB_DEV_QUAL_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_CFG_DESC \ + USB_CONFIG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_OTH_SPD_CFG_DESC \ + USB_OTH_SPD_CFG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_IFACE_DESCB USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ + 0, /**< detaching makes only sense in run-time mode */ \ + 512, /**< transfer size corresponds to page size for optimal flash writing */ \ + 0x0110 /**< DFU specification version 1.1 used */ ) + +#define DFUD_IFACE_DESCES \ + USB_IFACE_DESC_BYTES(CONF_USB_DFUD_BIFCNUM, \ + CONF_USB_DFUD_BALTSET, \ + CONF_USB_DFUD_BNUMEP, \ + USB_DFU_CLASS, \ + USB_DFU_SUBCLASS, \ + USB_DFU_PROTOCOL_DFU, \ + CONF_USB_DFUD_IINTERFACE), \ + DFUD_IFACE_DESCB + +#define DFUD_STR_DESCES \ + CONF_USB_DFUD_LANGID_DESC \ + CONF_USB_DFUD_IMANUFACT_STR_DESC \ + CONF_USB_DFUD_IPRODUCT_STR_DESC \ + CONF_USB_DFUD_ISERIALNUM_STR_DESC \ + CONF_USB_DFUD_ICONFIG_STR_DESC \ + CONF_USB_DFUD_IINTERFACE_STR_DESC + +/** USB Device descriptors and configuration descriptors */ +#define DFUD_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_DEV_QUAL_DESC, DFUD_CFG_DESC, DFUD_M_IFACE_DESCES, \ + DFUD_IFACE_DESCES, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES_HS, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_HS \ + DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_IFACE_DESCES_HS, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES + +#endif /* USBDF_DFU_DESC_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h new file mode 100644 index 0000000..7f82743 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h @@ -0,0 +1,150 @@ +/** + * \file + * + * \brief USB Device Firmware Upgrade (DFU) protocol definitions + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef _USB_PROTOCOL_DFU_H_ +#define _USB_PROTOCOL_DFU_H_ + +#include "usb_includes.h" + +/* + * \ingroup usb_protocol_group + * \defgroup dfu_protocol_group Device Firmware Upgrade Definitions + * \implements USB Device Firmware Upgrade Specification, Revision 1.1 + * @{ + */ + +/** + * \name USB DFU Subclass IDs + */ +//@{ +#define USB_DFU_CLASS 0xFE //!< Application Specific Class Code +//@} + +//! \name USB DFU Subclass IDs +//@{ +#define USB_DFU_SUBCLASS 0x01 //!< Device Firmware Upgrade Code +//@} + +//! \name USB DFU Protocol IDs +//@{ +#define USB_DFU_PROTOCOL_RUNTIME 0x01 //!< Runtime protocol +#define USB_DFU_PROTOCOL_DFU 0x02 //!< DFU mode protocol +//@} + +//! \name USB DFU Attributes bits mask +//@{ +#define USB_DFU_ATTRIBUTES_CAN_DOWNLOAD 0x01 +#define USB_DFU_ATTRIBUTES_CAN_UPLOAD 0x02 +#define USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT 0x04 +#define USB_DFU_ATTRIBUTES_WILL_DETACH 0x08 +//@} + +//! \name USB DFU Request IDs +//@{ +#define USB_REQ_DFU_DETACH 0x00 +#define USB_REQ_DFU_DNLOAD 0x01 +#define USB_REQ_DFU_UPLOAD 0x02 +#define USB_REQ_DFU_GETSTATUS 0x03 +#define USB_REQ_DFU_CLRSTATUS 0x04 +#define USB_REQ_DFU_GETSTATE 0x05 +#define USB_REQ_DFU_ABORT 0x06 +//@} + +/* + * Need to pack structures tightly, or the compiler might insert padding + * and violate the spec-mandated layout. + */ +COMPILER_PACK_SET(1) + +//! \name USB DFU Descriptors +//@{ + +//! DFU Functional Descriptor +typedef struct usb_dfu_func_desc { + uint8_t bFunctionLength; /**< Size of this descriptor, in bytes (always 9) */ + uint8_t bDescriptorType; /**< DFU FUNCTIONAL descriptor type (always 0x21) */ + uint8_t bmAttributes; /**< DFU attributes bit mask */ + le16_t wDetachTimeOut; /**< Time, in milliseconds, that the device will wait after receipt of the DFU_DETACH request */ + le16_t wTransferSize; /**< Maximum number of bytes that the device can accept per control-write transaction */ + le16_t bcdDFUVersion; /**< Numeric expression identifying the version of the DFU Specification release */ +} usb_dfu_func_desc_t; + +#define USB_DFU_FUNC_DESC_LEN 9 +#define USB_DFU_FUNC_DESC_TYPE 0x21 +#define USB_DFU_FUNC_DESC_BYTES(bmAttributes, wDetachTimeOut, wTransferSize, bcdDFUVersion) \ + USB_DFU_FUNC_DESC_LEN, /* bFunctionLength */ \ + USB_DFU_FUNC_DESC_TYPE, /* bDescriptorType */ \ + bmAttributes, \ + LE_BYTE0(wDetachTimeOut), LE_BYTE1(wDetachTimeOut), \ + LE_BYTE0(wTransferSize), LE_BYTE1(wTransferSize), \ + LE_BYTE0(bcdDFUVersion), LE_BYTE1(bcdDFUVersion) + +COMPILER_PACK_RESET() + +//! @} + +//! USB DFU Request IDs +enum usb_dfu_req { + USB_DFU_DETACH, + USB_DFU_DNLOAD, + USB_DFU_UPLOAD, + USB_DFU_GETSTATUS, + USB_DFU_CLRSTATUS, + USB_DFU_GETSTATE, + USB_DFU_ABORT, +}; + +//! USB DFU Device Status IDs +enum usb_dfu_status { + USB_DFU_STATUS_OK, + USB_DFU_STATUS_ERR_TARGET, + USB_DFU_STATUS_ERR_FILE, + USB_DFU_STATUS_ERR_WRITE, + USB_DFU_STATUS_ERR_ERASE, + USB_DFU_STATUS_ERR_CHECK_ERASED, + USB_DFU_STATUS_ERR_PROG, + USB_DFU_STATUS_ERR_VERIFY, + USB_DFU_STATUS_ERR_ADDRESS, + USB_DFU_STATUS_ERR_NOTDONE, + USB_DFU_STATUS_ERR_FIRMWARE, + USB_DFU_STATUS_ERR_VENDOR, + USB_DFU_STATUS_ERR_USBR, + USB_DFU_STATUS_ERR_POR, + USB_DFU_STATUS_ERR_UNKNOWN, + USB_DFU_STATUS_ERR_STALLEDPKT, +}; + +//! USB DFU Device State IDs +enum usb_dfu_state { + USB_DFU_STATE_APP_IDLE, + USB_DFU_STATE_APP_DETACH, + USB_DFU_STATE_DFU_IDLE, + USB_DFU_STATE_DFU_DNLOAD_SYNC, + USB_DFU_STATE_DFU_DNBUSY, + USB_DFU_STATE_DFU_DNLOAD_IDLE, + USB_DFU_STATE_DFU_MANIFEST_SYNC, + USB_DFU_STATE_DFU_MANIFEST, + USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET, + USB_DFU_STATE_DFU_UPLOAD_IDLE, + USB_DFU_STATE_DFU_ERROR, +}; + +#endif // _USB_PROTOCOL_DFU_H_ diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index 1c1672c..f737dc4 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -138,6 +138,8 @@ /* usbdc_register_funcion inside */ cdcdf_acm_init(); + dfudf_init(); + printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod); usbdc_start((struct usbd_descriptors *) usb_descs); usbdc_attach(); diff --git a/sysmoOCTSIM/usb_start.h b/sysmoOCTSIM/usb_start.h index a99d1ad..089c58d 100644 --- a/sysmoOCTSIM/usb_start.h +++ b/sysmoOCTSIM/usb_start.h @@ -15,6 +15,8 @@ #include "cdcdf_acm.h" #include "cdcdf_acm_desc.h" #include "ccid_df.h" +#include "dfudf.h" +#include "dfudf_desc.h" void usb_start(void); void cdc_device_acm_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: laforge/dfurt Gerrit-Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 Gerrit-Change-Number: 17027 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 13:36:31 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jan 2020 13:36:31 +0000 Subject: Change in osmo-ccid-firmware[master]: Merge branch 'dfurt' References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17028 ) Change subject: Merge branch 'dfurt' ...................................................................... Merge branch 'dfurt' Change-Id: I96d03994d3990d8ca95be02116070509fe672d9f --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/28/17028/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I96d03994d3990d8ca95be02116070509fe672d9f Gerrit-Change-Number: 17028 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:23:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:23:28 +0000 Subject: Change in osmo-msc[master]: vlr: remove unused parameter 'log_level' of auth_fsm_start() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17011 ) Change subject: vlr: remove unused parameter 'log_level' of auth_fsm_start() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d Gerrit-Change-Number: 17011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 27 Jan 2020 17:23:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:23:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:23:58 +0000 Subject: Change in osmo-msc[master]: vlr_sgs_fsm: add missing break, do not call to_null() twice In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17012 ) Change subject: vlr_sgs_fsm: add missing break, do not call to_null() twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb Gerrit-Change-Number: 17012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:23:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:25:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:25:39 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17016 ) Change subject: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 Gerrit-Change-Number: 17016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:26:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:26:02 +0000 Subject: Change in osmo-msc[master]: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17014 ) Change subject: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 Gerrit-Change-Number: 17014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:26:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:26:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:26:27 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17015 ) Change subject: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 Gerrit-Change-Number: 17015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:26:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:27:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:27:06 +0000 Subject: Change in osmo-msc[master]: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17013 ) Change subject: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 Gerrit-Change-Number: 17013 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 27 Jan 2020 17:27:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:28:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:28:41 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... Patch Set 2: is that ebcause app-specific nodes use negative values? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:30:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:30:21 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17023 ) Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:31:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:31:49 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17023 ) Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... Patch Set 1: I think clearly that's not aimed at storing packet data, since uint fields are separated (so each one still takes 8 bits even if only a few can be used) and there's pointers, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:34:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:34:28 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:36:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:36:05 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... Patch Set 1: What about using gprs_llc::frame_length() instead? does it make sense? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:36:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:36:23 +0000 Subject: Change in osmo-pcu[master]: encoding: fix log_alert_exit(): do not treat error as format string In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17008 ) Change subject: encoding: fix log_alert_exit(): do not treat error as format string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 Gerrit-Change-Number: 17008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:36:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:39:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jan 2020 17:39:30 +0000 Subject: Change in osmo-pcu[master]: tests/alloc: fix implicit conversion from 'double' to 'int8_t' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17009 ) Change subject: tests/alloc: fix implicit conversion from 'double' to 'int8_t' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b Gerrit-Change-Number: 17009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:40:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 17:40:35 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... Patch Set 1: > Patch Set 1: > > What about using gprs_llc::frame_length() instead? does it make sense? This sounds like the current frame length which is stored in buffer, while we need the size of buffer... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:40:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:43:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 17:43:50 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 to look at the new patch set (#2). Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... libmsc/gsm_04_11.h: remove unused sms_deliver definition Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca --- M include/osmocom/msc/gsm_04_11.h 1 file changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/17023/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 17:48:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 17:48:28 +0000 Subject: Change in libosmocore[master]: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17017 ) Change subject: tdef_vty: do not enforce enum 'node_type' in osmo_tdef_vty_groups_init() ...................................................................... Patch Set 2: > Patch Set 2: > > is that ebcause app-specific nodes use negative values? No, the point is that they're not a part of node_type enum (their values are greater, AFAIR starting from NODE_TYPE_MAX + 1). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb4c406c85d76a25fc53fc235484599aa87dc77c Gerrit-Change-Number: 17017 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 17:48:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:17:38 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 27 Jan 2020 18:17:38 +0000 Subject: Change in osmo-msc[master]: vlr: remove unused parameter 'log_level' of auth_fsm_start() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17011 ) Change subject: vlr: remove unused parameter 'log_level' of auth_fsm_start() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d Gerrit-Change-Number: 17011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jan 2020 18:17:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:09 +0000 Subject: Change in osmo-msc[master]: vlr: remove unused parameter 'log_level' of auth_fsm_start() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17011 ) Change subject: vlr: remove unused parameter 'log_level' of auth_fsm_start() ...................................................................... vlr: remove unused parameter 'log_level' of auth_fsm_start() We unconditionally use logging level of the parent FSM anyway. All callers of auth_fsm_start() always pass fi->log_level. Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d --- M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_auth_fsm.h M src/libvlr/vlr_lu_fsm.c 4 files changed, 2 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 7684d02..73f8955 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -338,7 +338,7 @@ if (is_auth_required(par)) { osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_AUTH, 0, 0); - vsub->auth_fsm = auth_fsm_start(vsub, fi->log_level, fi, + vsub->auth_fsm = auth_fsm_start(vsub, fi, PR_ARQ_E_AUTH_RES, par->is_r99, par->is_utran); diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index dcdf584..1cacbce 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -596,7 +596,6 @@ /* MSC->VLR: Start Procedure Authenticate_VLR (TS 23.012 Ch. 4.1.2.2) */ struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, - uint32_t log_level, struct osmo_fsm_inst *parent, uint32_t parent_term_event, bool is_r99, diff --git a/src/libvlr/vlr_auth_fsm.h b/src/libvlr/vlr_auth_fsm.h index 1f2cb49..4be889f 100644 --- a/src/libvlr/vlr_auth_fsm.h +++ b/src/libvlr/vlr_auth_fsm.h @@ -30,7 +30,6 @@ struct osmo_fsm vlr_auth_fsm; struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, - uint32_t log_level, struct osmo_fsm_inst *parent, uint32_t parent_term_event, bool is_r99, diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index e4d40f0..d5425e7 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -906,7 +906,7 @@ /* Authenticate_VLR */ osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_AUTH, LU_TIMEOUT_LONG, 0); - vsub->auth_fsm = auth_fsm_start(lfp->vsub, fi->log_level, + vsub->auth_fsm = auth_fsm_start(lfp->vsub, fi, VLR_ULA_E_AUTH_RES, lfp->is_r99, lfp->is_utran); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If2fdf2564eb56d3d94ec3800bdcb0aabcad4e48d Gerrit-Change-Number: 17011 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:09 +0000 Subject: Change in osmo-msc[master]: vlr_sgs_fsm: add missing break, do not call to_null() twice In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17012 ) Change subject: vlr_sgs_fsm: add missing break, do not call to_null() twice ...................................................................... vlr_sgs_fsm: add missing break, do not call to_null() twice Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb --- M src/libvlr/vlr_sgs_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index a131b7e..0f21617 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -234,6 +234,7 @@ if (*cause == SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER) break; to_null(fi); + break; case SGS_UE_E_RX_ALERT_FAILURE: to_null(fi); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib5d1d7633ca6c32d7d63bb1481f51355c97b90fb Gerrit-Change-Number: 17012 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:10 +0000 Subject: Change in osmo-msc[master]: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17013 ) Change subject: msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() ...................................................................... msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() The problem is that osmo_rat_type_name() calls get_value_string(), so we first cast -1 to 'const enum osmo_rat_type' and then to 'uint32_t'. Let's rather use OSMO_RAT_UNKNOWN. Found by GCC with -Wextra in CFLAGS: warning: operand of ?: changes signedness from ?int? to ?const enum osmo_rat_type? due to unsignedness of other operand [-Wsign-compare] Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 --- M include/osmocom/msc/sccp_ran.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/sccp_ran.h b/include/osmocom/msc/sccp_ran.h index f190d91..f84bf61 100644 --- a/include/osmocom/msc/sccp_ran.h +++ b/include/osmocom/msc/sccp_ran.h @@ -189,14 +189,14 @@ #define LOG_SCCP_RAN_CO(sri, peer_addr, conn_id, level, fmt, args...) \ LOGP((sri) && (sri)->ran? (sri)->ran->log_subsys : DMSC, level, "(%s-%u%s%s) " fmt, \ - osmo_rat_type_name((sri) && (sri)->ran? (sri)->ran->type : -1), conn_id, \ + osmo_rat_type_name((sri) && (sri)->ran ? (sri)->ran->type : OSMO_RAT_UNKNOWN), conn_id, \ peer_addr ? " from " : "", \ peer_addr ? osmo_sccp_inst_addr_name((sri)->sccp, peer_addr) : "", \ ## args) #define LOG_SCCP_RAN_CL_CAT(sri, peer_addr, subsys, level, fmt, args...) \ LOGP(subsys, level, "(%s%s%s) " fmt, \ - osmo_rat_type_name((sri) && (sri)->ran? (sri)->ran->type : -1), \ + osmo_rat_type_name((sri) && (sri)->ran ? (sri)->ran->type : OSMO_RAT_UNKNOWN), \ peer_addr ? " from " : "", \ peer_addr ? osmo_sccp_inst_addr_name((sri)->sccp, peer_addr) : "", \ ## args) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I63ba355102d3cc035ba90121e06aba7cf1776aa0 Gerrit-Change-Number: 17013 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:10 +0000 Subject: Change in osmo-msc[master]: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17014 ) Change subject: VTY: cosmetic: make struct cmd_node for GSMNET_NODE static ...................................................................... VTY: cosmetic: make struct cmd_node for GSMNET_NODE static We don't need to expose it anyway. Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 --- M src/libmsc/msc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index e2e892a..a629b5c 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -69,7 +69,7 @@ static struct gsm_network *gsmnet = NULL; -struct cmd_node net_node = { +static struct cmd_node net_node = { GSMNET_NODE, "%s(config-net)# ", 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbaed6b3b15aa719a19bb4be8fed347073025a22 Gerrit-Change-Number: 17014 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:11 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17015 ) Change subject: libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() ...................................................................... libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 --- M src/libmsc/gsm_04_08.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b284ccd..df48bcb 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1237,8 +1237,9 @@ apdu_len = gh->data[1]; apdu_data = gh->data+2; - DEBUGP(DRR, "RX APPLICATION INFO id/flags=0x%02x apdu_len=%u apdu=%s\n", - apdu_id_flags, apdu_len, osmo_hexdump(apdu_data, apdu_len)); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_DEBUG, "Rx RR APPLICATION INFO " + "(id/flags=0x%02x apdu_len=%u apdu=%s)\n", + apdu_id_flags, apdu_len, osmo_hexdump(apdu_data, apdu_len)); /* we're not using the app info blob anywhere, so ignore. */ #if 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2a0991c9bbf86b7eb248d74334f9472c56a3c964 Gerrit-Change-Number: 17015 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:21:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:21:11 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17016 ) Change subject: libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM ...................................................................... libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index df48bcb..d612e40 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1153,13 +1153,13 @@ struct vlr_subscr *vsub; if (msc_a_is_establishing_auth_ciph(msc_a)) { - LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR, + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "Ignoring Paging Response, conn already busy establishing authenticity\n"); return 0; } if (msc_a_is_accepted(msc_a)) { - LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR, "Ignoring Paging Response, conn already established\n"); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "Ignoring Paging Response, conn already established\n"); return 0; } @@ -1184,7 +1184,7 @@ * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occurred? */ vsub = msc_a_vsub(msc_a); if (!vsub) { - LOG_MSC_A(msc_a, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); + LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n"); msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE); return -EIO; } diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 3de18bf..8953c1d 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -529,7 +529,7 @@ DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity +DRR msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) lu_result_sent == 0 llist_count(&msub_list) == 1 @@ -1270,7 +1270,7 @@ DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established +DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_sms) llist_count(&msub_list) == 1 @@ -2154,7 +2154,7 @@ DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms) DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP -DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established +DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms) - MS replies with CP-ACK for received SMS MSC <--GERAN-A-- MS: SMS:0x04 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 Gerrit-Change-Number: 17016 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jan 27 18:22:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jan 2020 18:22:07 +0000 Subject: Change in osmo-bts[master]: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16974 ) Change subject: osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS ...................................................................... osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS src/osmo-bts-sysmo/Makefile.am:25: warning: bin_PROGRAMS was already defined in condition TRUE, which includes condition ENABLE_SYSMOBTS_CALIB src/osmo-bts-sysmo/Makefile.am:10: ... 'bin_PROGRAMS' previously defined here Change-Id: Ib2334dccefd507eaaa6d33e58d4c1e029d7fd540 --- M src/osmo-bts-sysmo/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index 4901ea3..5f588f8 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -22,7 +22,7 @@ l1fwd_proxy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) if ENABLE_SYSMOBTS_CALIB -bin_PROGRAMS = sysmobts-calib +bin_PROGRAMS += sysmobts-calib sysmobts_calib_SOURCES = misc/sysmobts-calib.c misc/sysmobts-layer1.c sysmobts_calib_LDADD = -lrt $(COMMON_LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib2334dccefd507eaaa6d33e58d4c1e029d7fd540 Gerrit-Change-Number: 16974 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 11:59:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 11:59:41 +0000 Subject: Change in libosmo-netif[master]: stream: Drop data during write() while in state NONE References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17029 ) Change subject: stream: Drop data during write() while in state NONE ...................................................................... stream: Drop data during write() while in state NONE It should not happen anyway because no fd should be active if state is NONE, but still it's an extra check. Change-Id: I6d58762b7d10078eb8d0981c13d35cb6f85cfe86 --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/29/17029/1 diff --git a/src/stream.c b/src/stream.c index fe3de2a..1a38e77 100644 --- a/src/stream.c +++ b/src/stream.c @@ -247,7 +247,7 @@ llist_del(lh); msg = llist_entry(lh, struct msgb, list); - if (cli->state == STREAM_CLI_STATE_CONNECTING) { + if (!osmo_stream_cli_is_connected(cli)) { LOGSCLI(cli, LOGL_ERROR, "not connected, dropping data!\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6d58762b7d10078eb8d0981c13d35cb6f85cfe86 Gerrit-Change-Number: 17029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 11:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 11:59:42 +0000 Subject: Change in libosmo-netif[master]: stream: Re-arrange cli states to fix 100% cpu usage bug References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17030 ) Change subject: stream: Re-arrange cli states to fix 100% cpu usage bug ...................................................................... stream: Re-arrange cli states to fix 100% cpu usage bug With previous state, osmo_stream_cli_close() could be called from osmo_stream_cli_open()(), and in that case state was kept as NONE while ending up with an associated fd being registered in the select loop. As a result, osmo_stream_cli_fd_cb() could be called while in state NONE, which was not expected and would simply return without modifying fd state flags, causing it to be called again and again. Related: OS#4378 Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 --- M src/stream.c 1 file changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/30/17030/1 diff --git a/src/stream.c b/src/stream.c index 1a38e77..c47ae3e 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,9 +129,9 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE = 0, - STREAM_CLI_STATE_CONNECTING = 1, - STREAM_CLI_STATE_CONNECTED = 2, + STREAM_CLI_STATE_NONE = 0, /* No fd associated, may have timer active to try to connect again */ + STREAM_CLI_STATE_CONNECTING = 1, /* Fd associated, but connection not yet confirmed by peer or lower layers */ + STREAM_CLI_STATE_CONNECTED = 2, /* Fd associated and connection is established */ STREAM_CLI_STATE_MAX }; @@ -190,7 +190,6 @@ LOGSCLI(cli, LOGL_INFO, "retrying in %d seconds...\n", cli->reconnect_timeout); osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); - cli->state = STREAM_CLI_STATE_CONNECTING; } /*! \brief Check if Osmocom Stream Client is in connected state @@ -324,7 +323,8 @@ } break; default: - break; + /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */ + osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state); } return 0; } @@ -345,11 +345,10 @@ cli->proto = IPPROTO_TCP; cli->ofd.fd = -1; - cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; cli->ofd.priv_nr = 0; /* XXX */ cli->ofd.cb = osmo_stream_cli_fd_cb; cli->ofd.data = cli; - cli->state = STREAM_CLI_STATE_CONNECTING; + cli->state = STREAM_CLI_STATE_NONE; osmo_timer_setup(&cli->timer, cli_timer_cb, cli); cli->reconnect_timeout = 5; /* default is 5 seconds. */ INIT_LLIST_HEAD(&cli->tx_queue); @@ -583,6 +582,7 @@ return ret; } cli->ofd.fd = ret; + cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE; if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -593,6 +593,7 @@ if (osmo_fd_register(&cli->ofd) < 0) goto error_close_socket; + cli->state = STREAM_CLI_STATE_CONNECTING; return 0; error_close_socket: @@ -653,6 +654,7 @@ return ret; } cli->ofd.fd = ret; + cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE; if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -663,6 +665,7 @@ if (osmo_fd_register(&cli->ofd) < 0) goto error_close_socket; + cli->state = STREAM_CLI_STATE_CONNECTING; return 0; error_close_socket: @@ -676,15 +679,7 @@ struct osmo_stream_cli *cli = data; LOGSCLI(cli, LOGL_DEBUG, "reconnecting.\n"); - - switch(cli->state) { - case STREAM_CLI_STATE_CONNECTING: - cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; - osmo_stream_cli_open(cli); - break; - default: - break; - } + osmo_stream_cli_open(cli); } /*! \brief Enqueue data to be sent via an Osmocom stream client -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 Gerrit-Change-Number: 17030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:05:53 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 28 Jan 2020 12:05:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_server In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_server ...................................................................... Patch Set 8: > Patch Set 8: > The mDNS_Emulation indeed doesn't seem to be doing a lot. I think it might be best to simply replace it with a CodecPort, like we do it with GTP or RTP, both also basd on UDP. I had started to replace it with a CodecPort but it turned out to be not a trivial task for me. In last week's meeting, we agreed to leave the mDNS_Emulation as-is in order to finish up the D-GSM ttcn3 tests rather soon. Could you guys please do another review of the current state of the patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 12:05:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:06:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 12:06:29 +0000 Subject: Change in libosmo-netif[master]: stream: Drop data during write() while in state NONE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17029 ) Change subject: stream: Drop data during write() while in state NONE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6d58762b7d10078eb8d0981c13d35cb6f85cfe86 Gerrit-Change-Number: 17029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 12:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:20:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:20:00 +0000 Subject: Change in libosmo-netif[master]: stream: Add new WAIT_RECONNECT cli state References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17031 ) Change subject: stream: Add new WAIT_RECONNECT cli state ...................................................................... stream: Add new WAIT_RECONNECT cli state It's not really needed right now from logic point of view, since we reused NONE for that. But it makes logging and logic clearer, and will make it easier if we decide to move it to FSMs at a later point in time. Other state value_string names are also modified with its whitespace removed since anyway we'd need to change them to match WAIT_RECONNECT length. Let's drop the space because imho it's not that useful and anyway if we move to FSMs at some point then we won't have them anyway. Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 --- M src/stream.c M tests/stream/stream_test.err 2 files changed, 14 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/31/17031/1 diff --git a/src/stream.c b/src/stream.c index c47ae3e..8a063f2 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,16 +129,18 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE = 0, /* No fd associated, may have timer active to try to connect again */ - STREAM_CLI_STATE_CONNECTING = 1, /* Fd associated, but connection not yet confirmed by peer or lower layers */ - STREAM_CLI_STATE_CONNECTED = 2, /* Fd associated and connection is established */ + STREAM_CLI_STATE_NONE, /* No fd associated, no timer active */ + STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */ + STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */ + STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */ STREAM_CLI_STATE_MAX }; static const struct value_string stream_cli_state_names[] = { - { STREAM_CLI_STATE_NONE, " NONE" }, - { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, - { STREAM_CLI_STATE_CONNECTED, " CONNECTED" }, + { STREAM_CLI_STATE_NONE, "NONE" }, + { STREAM_CLI_STATE_WAIT_RECONNECT, "WAIT_RECONNECT" }, + { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, + { STREAM_CLI_STATE_CONNECTED, "CONNECTED" }, { 0, NULL } }; @@ -187,6 +189,7 @@ return; } + cli->state = STREAM_CLI_STATE_WAIT_RECONNECT; LOGSCLI(cli, LOGL_INFO, "retrying in %d seconds...\n", cli->reconnect_timeout); osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); @@ -669,6 +672,7 @@ return 0; error_close_socket: + cli->state = STREAM_CLI_STATE_NONE; close(cli->ofd.fd); cli->ofd.fd = -1; return -EIO; diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 04bfcfe..69a0b85 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -12,8 +12,8 @@ {2.000006} autoreconnecting test step 6 [client OK, server OK], FD reg 1 {2.000007} autoreconnecting test step 5 [client OK, server OK], FD reg 1 -[ CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[ NONE] osmo_stream_cli_reconnect(): retrying in 9 seconds... +[CONNECTED] osmo_stream_cli_recv(): connection closed with srv +[WAIT_RECONNECT] osmo_stream_cli_reconnect(): retrying in 9 seconds... {11.000008} autoreconnecting test step 4 [client OK, server OK], FD reg 0 @@ -37,7 +37,7 @@ {11.000017} non-reconnecting test step 2 [client OK, server OK], FD reg 1 {11.000018} non-reconnecting test step 1 [client OK, server OK], FD reg 1 -[ CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[ NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. +[CONNECTED] osmo_stream_cli_recv(): connection closed with srv +[NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 Gerrit-Change-Number: 17031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:20:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:20:01 +0000 Subject: Change in libosmo-netif[master]: stream: Rename cli state NONE to CLOSED References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17032 ) Change subject: stream: Rename cli state NONE to CLOSED ...................................................................... stream: Rename cli state NONE to CLOSED It makes a lot more sense calling it this way since it matches the state of the stream at that point. Change-Id: Ic02aec3f7f095e0e0e1f940425f577be5048e98f --- M src/stream.c M tests/stream/stream_test.err 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/32/17032/1 diff --git a/src/stream.c b/src/stream.c index 8a063f2..65532d3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,7 +129,7 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE, /* No fd associated, no timer active */ + STREAM_CLI_STATE_CLOSED, /* No fd associated, no timer active */ STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */ STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */ STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */ @@ -137,7 +137,7 @@ }; static const struct value_string stream_cli_state_names[] = { - { STREAM_CLI_STATE_NONE, "NONE" }, + { STREAM_CLI_STATE_CLOSED, "CLOSED" }, { STREAM_CLI_STATE_WAIT_RECONNECT, "WAIT_RECONNECT" }, { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, { STREAM_CLI_STATE_CONNECTED, "CONNECTED" }, @@ -221,7 +221,7 @@ cli->disconnect_cb(cli); } - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; } static void osmo_stream_cli_read(struct osmo_stream_cli *cli) @@ -351,7 +351,7 @@ cli->ofd.priv_nr = 0; /* XXX */ cli->ofd.cb = osmo_stream_cli_fd_cb; cli->ofd.data = cli; - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; osmo_timer_setup(&cli->timer, cli_timer_cb, cli); cli->reconnect_timeout = 5; /* default is 5 seconds. */ INIT_LLIST_HEAD(&cli->tx_queue); @@ -672,7 +672,7 @@ return 0; error_close_socket: - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; close(cli->ofd.fd); cli->ofd.fd = -1; return -EIO; diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 69a0b85..0d08c67 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -38,6 +38,6 @@ {11.000018} non-reconnecting test step 1 [client OK, server OK], FD reg 1 [CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. +[CLOSED] osmo_stream_cli_reconnect(): not reconnecting, disabled. {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic02aec3f7f095e0e0e1f940425f577be5048e98f Gerrit-Change-Number: 17032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:41:44 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 12:41:44 +0000 Subject: Change in osmo-ccid-firmware[master]: Merge branch 'dfurt' In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17028 ) Change subject: Merge branch 'dfurt' ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I96d03994d3990d8ca95be02116070509fe672d9f Gerrit-Change-Number: 17028 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 to look at the new patch set (#3). Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails Currently code using that function in osmo-pcu is disabled, allegadly because SGSN was sending incorrect values, but it looks more like a CSN1 issue. Related: OS#1525, OS#3499 Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 4 files changed, 49 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/16993/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 to look at the new patch set (#2). Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... csn1: Update M_NULL CSN_DESCR to match wireshark Port from iwireshark.git commit cc6d4341e65ef2e8d8488fe0ac0f236ece0dd844. It looks like it makes no difference to us now, but other EGPRS messages may use it in the future. Ported-by: Pau Espin Pedrol Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 --- M src/csn1.cpp M src/csn1.h M src/gsm_rlcmac.cpp 3 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/16994/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 to look at the new patch set (#2). Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function Port from wireshark.git commit fd9f182f4b13a3d81b1b5c797a6e4b9d6d327fdd. Ported-by: Pau Espin Pedrol Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/16995/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: shuffle decrements of remaining_bits_len In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 to look at the new patch set (#2). Change subject: csn1: shuffle decrements of remaining_bits_len ...................................................................... csn1: shuffle decrements of remaining_bits_len So that they always occur next to an increment of bit_offset. Port from wireshark.git 1c81971d4292438ffdf83e9f9b9ab96c133c785b. Ported-by: Pau Espin Pedrol Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 --- M src/csn1.cpp 1 file changed, 14 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/16996/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 Gerrit-Change-Number: 16996 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix an infinite loop in CSN.1 dissector when having more than 2... In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 to look at the new patch set (#2). Change subject: csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits ...................................................................... csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits Port of wireshark.git 8b5aa913711b32b1e1bc707919d2a98c1875d443. Ported-by: Pau Espin Pedrol Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 --- M src/csn1.cpp M src/csn1.h 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/17000/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 Gerrit-Change-Number: 17000 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix warning with -Wmissing-prototypes In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 to look at the new patch set (#2). Change subject: csn1: Fix warning with -Wmissing-prototypes ...................................................................... csn1: Fix warning with -Wmissing-prototypes Port of wireshark.git 2e52e2ac997ca58caabee3270b5a6c3f96159ff0. Ported-by: Pau Espin Pedrol Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/17001/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 Gerrit-Change-Number: 17001 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Don't cast away constness In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 to look at the new patch set (#2). Change subject: csn1: Don't cast away constness ...................................................................... csn1: Don't cast away constness Port of wireshark.git commit 8e22ded7f8537e37e89ba558c83702d127443ae8. Ported-by: Pau Espin Pedrol Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 --- M src/csn1.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/17002/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 Gerrit-Change-Number: 17002 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Try to fix cast discards '__attribute__((const))' qualifier fro... In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 to look at the new patch set (#2). Change subject: csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type ...................................................................... csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type Port of wireshark.git 1ff6213c949b373bcb7de5c48a5a4f805093066f. Ported-by: Pau Espin Pedrol Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 --- M src/csn1.h 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/03/17003/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 Gerrit-Change-Number: 17003 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 12:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 12:45:49 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 to look at the new patch set (#2). Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 Port of wireshark.git commit fd68c7dfc7d06ce7babe914f2575d9e4f35988ad. Ported-by: Pau Espin Pedrol Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd --- M src/csn1.cpp 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/17005/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:04:12 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 28 Jan 2020 13:04:12 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 26: Code-Review+1 I agree with Pau that it's hard to review this patch properly, due to its size. But I also understand Neels reasoning for not spending the time on splitting it up further, and the even larger inter-msc handover related refactoring was accepted too. >From quickly skimming through this patch, I did not find any issues. It looks like all issues that Pau found are resolved. A new OsmoHLR release was also done recently. Pau, can you take another look at this patch (and if possible also follow-up patches), so we can finish up merging these D-GSM patches? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 13:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:40:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 13:40:22 +0000 Subject: Change in osmo-ccid-firmware[master]: WIP: Add DFU runtime descriptor References: Message-ID: Hello laforge, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17033 to review the following change. Change subject: WIP: Add DFU runtime descriptor ...................................................................... WIP: Add DFU runtime descriptor Change-Id: I031c2353248873735698c845f591537779eee995 --- A sysmoOCTSIM/dfu_descriptors.h M sysmoOCTSIM/usb_descriptors.c M sysmoOCTSIM/usb_descriptors.h A sysmoOCTSIM/usb_dfu.h 4 files changed, 133 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/33/17033/1 diff --git a/sysmoOCTSIM/dfu_descriptors.h b/sysmoOCTSIM/dfu_descriptors.h new file mode 100644 index 0000000..8cbaf23 --- /dev/null +++ b/sysmoOCTSIM/dfu_descriptors.h @@ -0,0 +1,44 @@ +#ifndef _USB_DEV_DFU_H +#define _USB_DEV_DFU_H + +#include + +#include "usb_protocol.h" +#include "usb_dfu.h" + +/* USB DFU functional descriptor */ +#define DFU_FUNC_DESC { \ + .bLength = USB_DT_DFU_SIZE, \ + .bDescriptorType = USB_DT_DFU, \ + .bmAttributes = USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \ + .wDetachTimeOut = 5000, \ + .wTransferSize = FLASH_PAGE_SIZE, \ + .bcdDFUVersion = 0x0100, \ +} + +/* Number of DFU interface during runtime mode */ +#define DFURT_NUM_IF 1 + +/* to be used by the runtime as part of its USB descriptor structure + * declaration */ +#define DFURT_IF_DESCRIPTOR_STRUCT \ + struct usb_iface_desc dfu_rt; \ + struct usb_dfu_func_descriptor func_dfu; + +/* to be used by the runtime as part of its USB Dsecriptor structure + * definition */ +#define DFURT_IF_DESCRIPTOR(dfuIF, dfuSTR) \ + .dfu_rt = { \ + .bLength = sizeof(struct usb_iface_desc), \ + .bDescriptorType = USB_DT_INTERFACE, \ + .bInterfaceNumber = dfuIF, \ + .bAlternateSetting = 0, \ + .bNumEndpoints = 0, \ + .bInterfaceClass = 0xFE, \ + .bInterfaceSubClass = 0x01, \ + .bInterfaceProtocol = 0x01, \ + .iInterface = dfuSTR, \ + }, \ + .func_dfu = DFU_FUNC_DESC \ + +#endif diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index 2b41390..00d2007 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -47,8 +47,10 @@ .bDescriptorType = USB_DT_CONFIG, .wTotalLength = sizeof(usb_fs_descs.cfg) + sizeof(usb_fs_descs.cdc) + - sizeof(usb_fs_descs.ccid), - .bNumInterfaces = 3, + sizeof(usb_fs_descs.ccid) + + sizeof(usb_fs_descs.dfu_rt) + + sizeof(usb_fs_descs.func_dfu), + .bNumInterfaces = 4, .bConfigurationValue = CONF_USB_CDCD_ACM_BCONFIGVAL, .iConfiguration = STR_DESC_CONFIG, .bmAttributes = CONF_USB_CDCD_ACM_BMATTRI, @@ -206,7 +208,7 @@ }, }, }, - //DFURT_IF_DESCRIPTOR, + DFURT_IF_DESCRIPTOR(3, STR_DESC_INTF_DFURT), .str = { #if 0 CDCD_ACM_STR_DESCES @@ -219,6 +221,7 @@ 22, 3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0, 10, 3, 'C',0, 'C',0, 'I',0, 'D',0, 12, 3, 'F',0, 'I',0, 'X',0, 'M',0, 'E',0, + 28, 3, 'D',0, 'F',0, 'U',0, ' ',0, '(',0, 'R',0, 'u',0, 'n',0, 't',0, 'i',0, 'm',0, 'e',0 ,')',0, #endif } }; diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index df072c2..ea47d07 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -20,6 +20,7 @@ #define USB_DESCRIPTORS_H_ #include "ccid_device.h" +#include "dfu_descriptors.h" #define CCID_NUM_CLK_SUPPORTED 4 @@ -34,6 +35,7 @@ STR_DESC_INTF_ACM_DATA, STR_DESC_INTF_CCID, STR_DESC_SERIAL, + STR_DESC_INTF_DFURT, }; /* a struct of structs representing the concatenated collection of USB descriptors */ @@ -63,7 +65,8 @@ struct usb_ccid_class_descriptor class; struct usb_ep_desc ep[3]; } ccid; - uint8_t str[148]; + DFURT_IF_DESCRIPTOR_STRUCT + uint8_t str[176]; } __attribute__((packed)); #endif /* USB_DESCRIPTORS_H_ */ diff --git a/sysmoOCTSIM/usb_dfu.h b/sysmoOCTSIM/usb_dfu.h new file mode 100644 index 0000000..b447c7c --- /dev/null +++ b/sysmoOCTSIM/usb_dfu.h @@ -0,0 +1,79 @@ +#ifndef _USB_DFU_H +#define _USB_DFU_H +/* USB Device Firmware Update Implementation for OpenPCD + * (C) 2006 by Harald Welte + * + * Protocol definitions for USB DFU + * + * This ought to be compliant to the USB DFU Spec 1.0 as available from + * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf + * + */ + +#include + +#define USB_DT_DFU 0x21 + +struct usb_dfu_func_descriptor { + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bmAttributes; +#define USB_DFU_CAN_DOWNLOAD (1 << 0) +#define USB_DFU_CAN_UPLOAD (1 << 1) +#define USB_DFU_MANIFEST_TOL (1 << 2) +#define USB_DFU_WILL_DETACH (1 << 3) + uint16_t wDetachTimeOut; + uint16_t wTransferSize; + uint16_t bcdDFUVersion; +} __attribute__ ((packed)); + +#define USB_DT_DFU_SIZE 9 + +/* DFU class-specific requests (Section 3, DFU Rev 1.1) */ +#define USB_REQ_DFU_DETACH 0x00 +#define USB_REQ_DFU_DNLOAD 0x01 +#define USB_REQ_DFU_UPLOAD 0x02 +#define USB_REQ_DFU_GETSTATUS 0x03 +#define USB_REQ_DFU_CLRSTATUS 0x04 +#define USB_REQ_DFU_GETSTATE 0x05 +#define USB_REQ_DFU_ABORT 0x06 + +struct dfu_status { + uint8_t bStatus; + uint8_t bwPollTimeout[3]; + uint8_t bState; + uint8_t iString; +} __attribute__((packed)); + +#define DFU_STATUS_OK 0x00 +#define DFU_STATUS_errTARGET 0x01 +#define DFU_STATUS_errFILE 0x02 +#define DFU_STATUS_errWRITE 0x03 +#define DFU_STATUS_errERASE 0x04 +#define DFU_STATUS_errCHECK_ERASED 0x05 +#define DFU_STATUS_errPROG 0x06 +#define DFU_STATUS_errVERIFY 0x07 +#define DFU_STATUS_errADDRESS 0x08 +#define DFU_STATUS_errNOTDONE 0x09 +#define DFU_STATUS_errFIRMWARE 0x0a +#define DFU_STATUS_errVENDOR 0x0b +#define DFU_STATUS_errUSBR 0x0c +#define DFU_STATUS_errPOR 0x0d +#define DFU_STATUS_errUNKNOWN 0x0e +#define DFU_STATUS_errSTALLEDPKT 0x0f + +enum dfu_state { + DFU_STATE_appIDLE = 0, + DFU_STATE_appDETACH = 1, + DFU_STATE_dfuIDLE = 2, + DFU_STATE_dfuDNLOAD_SYNC = 3, + DFU_STATE_dfuDNBUSY = 4, + DFU_STATE_dfuDNLOAD_IDLE = 5, + DFU_STATE_dfuMANIFEST_SYNC = 6, + DFU_STATE_dfuMANIFEST = 7, + DFU_STATE_dfuMANIFEST_WAIT_RST = 8, + DFU_STATE_dfuUPLOAD_IDLE = 9, + DFU_STATE_dfuERROR = 10, +}; + +#endif /* _USB_DFU_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I031c2353248873735698c845f591537779eee995 Gerrit-Change-Number: 17033 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:40:23 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 13:40:23 +0000 Subject: Change in osmo-ccid-firmware[master]: support DFU detach to switch from fw to bootloader References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 ) Change subject: support DFU detach to switch from fw to bootloader ...................................................................... support DFU detach to switch from fw to bootloader This makes flashing a bit more convenient, because pushing the button is not required. It can be disabled using make DISABLE_DFU_DETACH=1. Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 --- M sysmoOCTSIM/dfu_descriptors.h M sysmoOCTSIM/gcc/Makefile A sysmoOCTSIM/usb/class/dfu/device/dfudf.c A sysmoOCTSIM/usb/class/dfu/device/dfudf.h A sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h A sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_start.c M sysmoOCTSIM/usb_start.h 8 files changed, 653 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/34/17034/1 diff --git a/sysmoOCTSIM/dfu_descriptors.h b/sysmoOCTSIM/dfu_descriptors.h index 8cbaf23..853a98b 100644 --- a/sysmoOCTSIM/dfu_descriptors.h +++ b/sysmoOCTSIM/dfu_descriptors.h @@ -10,8 +10,8 @@ #define DFU_FUNC_DESC { \ .bLength = USB_DT_DFU_SIZE, \ .bDescriptorType = USB_DT_DFU, \ - .bmAttributes = USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \ - .wDetachTimeOut = 5000, \ + .bmAttributes = USB_DFU_WILL_DETACH, \ + .wDetachTimeOut = 0, \ .wTransferSize = FLASH_PAGE_SIZE, \ .bcdDFUVersion = 0x0100, \ } diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 6c0974f..9df0c01 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -7,9 +7,11 @@ EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- +DISABLE_DFU_DETACH ?= 0 + CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD + -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld @@ -75,6 +77,8 @@ -I"../usb/class/ccid/device" \ -I"../usb/class/cdc" \ -I"../usb/class/cdc/device" \ + -I"../usb/class/dfu" \ + -I"../usb/class/dfu/device" \ -I"../usb/device" \ $(NULL) @@ -135,6 +139,7 @@ talloc.o \ usb/class/ccid/device/ccid_df.o \ usb/class/cdc/device/cdcdf_acm.o \ + usb/class/dfu/device/dfudf.o \ usb/device/usbdc.o \ usb/usb_protocol.o \ usb_descriptors.o \ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c new file mode 100644 index 0000000..2b11fb4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -0,0 +1,300 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Implementation. + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "dfudf.h" +#include "usb_protocol_dfu.h" +#include "dfudf_desc.h" + +/** USB Device DFU Function Specific Data */ +struct dfudf_func_data { + /** DFU Interface information */ + uint8_t func_iface; + /** DFU Enable Flag */ + bool enabled; +}; + +static struct usbdf_driver _dfudf; +static struct dfudf_func_data _dfudf_funcd; + +/** USB DFU functional descriptor (with DFU attributes) */ +static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB}; +static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes; + +enum usb_dfu_state dfu_state = USB_DFU_STATE_APP_IDLE; +enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; + +uint8_t dfu_download_data[512]; +uint16_t dfu_download_length = 0; +size_t dfu_download_offset = 0; +bool dfu_manifestation_complete = false; + +/** + * \brief Enable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB interface descriptor + * \return Operation status. + */ +static int32_t dfudf_enable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + uint8_t * ifc; + + ifc = desc->sod; + if (NULL == ifc) { + return ERR_NOT_FOUND; + } + + ifc_desc.bInterfaceNumber = ifc[2]; + ifc_desc.bInterfaceClass = ifc[5]; + + if (USB_DFU_CLASS == ifc_desc.bInterfaceClass) { + if (func_data->func_iface == ifc_desc.bInterfaceNumber) { // Initialized + return ERR_ALREADY_INITIALIZED; + } else if (func_data->func_iface != 0xFF) { // Occupied + return ERR_NO_RESOURCE; + } else { + func_data->func_iface = ifc_desc.bInterfaceNumber; + } + } else { // Not supported by this function driver + return ERR_NOT_FOUND; + } + + // there are no endpoint to install since DFU uses only the control endpoint + + ifc = usb_find_desc(usb_desc_next(desc->sod), desc->eod, USB_DT_INTERFACE); + + // Installed + _dfudf_funcd.enabled = true; + return ERR_NONE; +} + +/** + * \brief Disable DFU Function + * \param[in] drv Pointer to USB device function driver + * \param[in] desc Pointer to USB device descriptor + * \return Operation status. + */ +static int32_t dfudf_disable(struct usbdf_driver *drv, struct usbd_descriptors *desc) +{ + struct dfudf_func_data *func_data = (struct dfudf_func_data *)(drv->func_data); + + usb_iface_desc_t ifc_desc; + + if (desc) { + ifc_desc.bInterfaceClass = desc->sod[5]; + // Check interface + if (ifc_desc.bInterfaceClass != USB_DFU_CLASS) { + return ERR_NOT_FOUND; + } + } + + func_data->func_iface = 0xFF; + + _dfudf_funcd.enabled = false; + return ERR_NONE; +} + +/** + * \brief DFU Control Function + * \param[in] drv Pointer to USB device function driver + * \param[in] ctrl USB device general function control type + * \param[in] param Parameter pointer + * \return Operation status. + */ +static int32_t dfudf_ctrl(struct usbdf_driver *drv, enum usbdf_control ctrl, void *param) +{ + switch (ctrl) { + case USBDF_ENABLE: + return dfudf_enable(drv, (struct usbd_descriptors *)param); + + case USBDF_DISABLE: + return dfudf_disable(drv, (struct usbd_descriptors *)param); + + case USBDF_GET_IFACE: + return ERR_UNSUPPORTED_OP; + + default: + return ERR_INVALID_ARG; + } +} + +/** + * \brief Process the DFU IN request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_in_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (USB_DATA_STAGE == stage) { // the data stage is only for IN data, which we sent + return ERR_NONE; // send the IN data + } + + int32_t to_return = ERR_NONE; + uint8_t response[6]; // buffer for the response to this request + switch (req->bRequest) { + case USB_DFU_UPLOAD: // upload firmware from flash not supported + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) + break; + case USB_DFU_GETSTATUS: // get status + response[0] = dfu_status; // set status + response[1] = 10; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[2] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[3] = 0; // set poll timeout (24 bits, in milliseconds) to small value for periodical poll + response[4] = dfu_state; // set state + response[5] = 0; // string not used + to_return = usbdc_xfer(ep, response, 6, false); // send back status + if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) { // download has not completed + dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state + } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { + if (!dfu_manifestation_complete) { + dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode + } else if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { + dfu_state = USB_DFU_STATE_DFU_IDLE; // go back to idle mode + } else { // this should not happen (after manifestation the state should be dfuMANIFEST-WAIT-RESET if we are not manifest tolerant) + dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; // wait for reset + } + } + break; + case USB_DFU_GETSTATE: // get state + response[0] = dfu_state; // return state + to_return = usbdc_xfer(ep, response, 1, false); // send back state + break; + default: // all other DFU class IN request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the DFU OUT request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_out_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + int32_t to_return = ERR_NONE; + switch (req->bRequest) { + case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode +#if (DISABLE_DFU_DETACH != 0) + dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) +#else + to_return = usbdc_xfer(ep, NULL, 0, false); + *(uint32_t*)HSRAM_ADDR = 0x44465521; + __disable_irq(); + delay_us(10000); + usbdc_detach(); + delay_us(100000); + NVIC_SystemReset(); +#endif + break; + case USB_DFU_CLRSTATUS: // clear status + if (USB_DFU_STATE_DFU_ERROR == dfu_state || USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error + dfu_status = USB_DFU_STATUS_OK; // clear error status + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state + } + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + case USB_DFU_ABORT: // abort current operation + dfu_download_offset = 0; // reset download progress + dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK + break; + default: // all other DFU class OUT request + dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown class request + to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) + break; + } + + return to_return; +} + +/** + * \brief Process the CDC class request + * \param[in] ep Endpoint address. + * \param[in] req Pointer to the request. + * \param[in] stage Stage of the request. + * \return Operation status. + */ +static int32_t dfudf_req(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request + return ERR_NOT_FOUND; + } + + if ((req->wIndex == _dfudf_funcd.func_iface)) { + if (req->bmRequestType & USB_EP_DIR_IN) { + return dfudf_in_req(ep, req, stage); + } else { + return dfudf_out_req(ep, req, stage); + } + } else { + return ERR_NOT_FOUND; + } + return ERR_NOT_FOUND; +} + +/** USB Device DFU Handler Struct */ +static struct usbdc_handler dfudf_req_h = {NULL, (FUNC_PTR)dfudf_req}; + +/** + * \brief Initialize the USB DFU Function Driver + */ +int32_t dfudf_init(void) +{ + if (usbdc_get_state() > USBD_S_POWER) { + return ERR_DENIED; + } + + _dfudf.ctrl = dfudf_ctrl; + _dfudf.func_data = &_dfudf_funcd; + + usbdc_register_function(&_dfudf); + usbdc_register_handler(USBDC_HDL_REQ, &dfudf_req_h); + + return ERR_NONE; +} + +/** + * \brief De-initialize the USB DFU Function Driver + */ +void dfudf_deinit(void) +{ +} + +/** + * \brief Check whether DFU Function is enabled + */ +bool dfudf_is_enabled(void) +{ + return _dfudf_funcd.enabled; +} diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h new file mode 100644 index 0000000..cee5845 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h @@ -0,0 +1,77 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Definition. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_H_ +#define USBDF_DFU_H_ + +#include "usbdc.h" +#include "usb_protocol_dfu.h" + +/** Current DFU state */ +extern enum usb_dfu_state dfu_state; +/**< Current DFU status */ +extern enum usb_dfu_status dfu_status; + +/** Downloaded data to be programmed in flash + * + * 512 is the flash page size of the SAM D5x/E5x + */ +extern uint8_t dfu_download_data[512]; +/** Length of downloaded data in bytes */ +extern uint16_t dfu_download_length; +/** Offset of where the downloaded data should be flashed in bytes */ +extern size_t dfu_download_offset; +/** If manifestation (firmware flash and check) is complete */ +extern bool dfu_manifestation_complete; + +/** + * \brief Initialize the USB DFU Function Driver + * \return Operation status. + */ +int32_t dfudf_init(void); + +/** + * \brief Deinitialize the USB DFU Function Driver + * \return Operation status. + */ +void dfudf_deinit(void); + +/** + * \brief Check whether DFU Function is enabled + * \return Operation status. + * \return true DFU Function is enabled + * \return false DFU Function is disabled + */ +bool dfudf_is_enabled(void); + +#endif /* USBDF_DFU_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h new file mode 100644 index 0000000..50a79e4 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h @@ -0,0 +1,114 @@ +/** + * \file + * + * \brief USB Device Stack DFU Function Descriptor Setting. + * + * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * \asf_license_start + * + * \page License + * + * Subject to your compliance with these terms, you may use Microchip + * software and any derivatives exclusively with Microchip products. + * It is your responsibility to comply with third party license terms applicable + * to your use of third party software (including open source software) that + * may accompany Microchip software. + * + * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, + * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE + * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL + * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE + * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE + * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT + * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY + * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, + * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. + * + * \asf_license_stop + */ + +#ifndef USBDF_DFU_DESC_H_ +#define USBDF_DFU_DESC_H_ + +#include "usb_protocol.h" +#include "usbd_config.h" +#include "usb_protocol_dfu.h" + +#define DFUD_DEV_DESC \ + USB_DEV_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BDEVICEPROTOCOL, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_OPENMOKO_IDVENDOR, \ + CONF_USB_OSMOASF4DFU_IDPRODUCT, \ + CONF_USB_DFUD_BCDDEVICE, \ + CONF_USB_DFUD_IMANUFACT, \ + CONF_USB_DFUD_IPRODUCT, \ + CONF_USB_DFUD_ISERIALNUM, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_DEV_QUAL_DESC \ + USB_DEV_QUAL_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ + CONF_USB_DFUD_BDEVICECLASS, \ + CONF_USB_DFUD_BDEVICESUBCLASS, \ + CONF_USB_DFUD_BMAXPKSZ0, \ + CONF_USB_DFUD_BNUMCONFIG) + +#define DFUD_CFG_DESC \ + USB_CONFIG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_OTH_SPD_CFG_DESC \ + USB_OTH_SPD_CFG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ + CONF_USB_DFUD_BNUMINTERFACES, \ + CONF_USB_DFUD_BCONFIGVAL, \ + CONF_USB_DFUD_ICONFIG, \ + CONF_USB_DFUD_BMATTRI, \ + CONF_USB_DFUD_BMAXPOWER) + +#define DFUD_IFACE_DESCB USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ + 0, /**< detaching makes only sense in run-time mode */ \ + 512, /**< transfer size corresponds to page size for optimal flash writing */ \ + 0x0110 /**< DFU specification version 1.1 used */ ) + +#define DFUD_IFACE_DESCES \ + USB_IFACE_DESC_BYTES(CONF_USB_DFUD_BIFCNUM, \ + CONF_USB_DFUD_BALTSET, \ + CONF_USB_DFUD_BNUMEP, \ + USB_DFU_CLASS, \ + USB_DFU_SUBCLASS, \ + USB_DFU_PROTOCOL_DFU, \ + CONF_USB_DFUD_IINTERFACE), \ + DFUD_IFACE_DESCB + +#define DFUD_STR_DESCES \ + CONF_USB_DFUD_LANGID_DESC \ + CONF_USB_DFUD_IMANUFACT_STR_DESC \ + CONF_USB_DFUD_IPRODUCT_STR_DESC \ + CONF_USB_DFUD_ISERIALNUM_STR_DESC \ + CONF_USB_DFUD_ICONFIG_STR_DESC \ + CONF_USB_DFUD_IINTERFACE_STR_DESC + +/** USB Device descriptors and configuration descriptors */ +#define DFUD_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_LS_FS \ + DFUD_DEV_DESC, DFUD_DEV_QUAL_DESC, DFUD_CFG_DESC, DFUD_M_IFACE_DESCES, \ + DFUD_IFACE_DESCES, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES_HS, DFUD_STR_DESCES + +#define DFUD_HS_DESCES_HS \ + DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_IFACE_DESCES_HS, DFUD_OTH_SPD_CFG_DESC, \ + DFUD_IFACE_DESCES + +#endif /* USBDF_DFU_DESC_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h new file mode 100644 index 0000000..7f82743 --- /dev/null +++ b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h @@ -0,0 +1,150 @@ +/** + * \file + * + * \brief USB Device Firmware Upgrade (DFU) protocol definitions + * + * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef _USB_PROTOCOL_DFU_H_ +#define _USB_PROTOCOL_DFU_H_ + +#include "usb_includes.h" + +/* + * \ingroup usb_protocol_group + * \defgroup dfu_protocol_group Device Firmware Upgrade Definitions + * \implements USB Device Firmware Upgrade Specification, Revision 1.1 + * @{ + */ + +/** + * \name USB DFU Subclass IDs + */ +//@{ +#define USB_DFU_CLASS 0xFE //!< Application Specific Class Code +//@} + +//! \name USB DFU Subclass IDs +//@{ +#define USB_DFU_SUBCLASS 0x01 //!< Device Firmware Upgrade Code +//@} + +//! \name USB DFU Protocol IDs +//@{ +#define USB_DFU_PROTOCOL_RUNTIME 0x01 //!< Runtime protocol +#define USB_DFU_PROTOCOL_DFU 0x02 //!< DFU mode protocol +//@} + +//! \name USB DFU Attributes bits mask +//@{ +#define USB_DFU_ATTRIBUTES_CAN_DOWNLOAD 0x01 +#define USB_DFU_ATTRIBUTES_CAN_UPLOAD 0x02 +#define USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT 0x04 +#define USB_DFU_ATTRIBUTES_WILL_DETACH 0x08 +//@} + +//! \name USB DFU Request IDs +//@{ +#define USB_REQ_DFU_DETACH 0x00 +#define USB_REQ_DFU_DNLOAD 0x01 +#define USB_REQ_DFU_UPLOAD 0x02 +#define USB_REQ_DFU_GETSTATUS 0x03 +#define USB_REQ_DFU_CLRSTATUS 0x04 +#define USB_REQ_DFU_GETSTATE 0x05 +#define USB_REQ_DFU_ABORT 0x06 +//@} + +/* + * Need to pack structures tightly, or the compiler might insert padding + * and violate the spec-mandated layout. + */ +COMPILER_PACK_SET(1) + +//! \name USB DFU Descriptors +//@{ + +//! DFU Functional Descriptor +typedef struct usb_dfu_func_desc { + uint8_t bFunctionLength; /**< Size of this descriptor, in bytes (always 9) */ + uint8_t bDescriptorType; /**< DFU FUNCTIONAL descriptor type (always 0x21) */ + uint8_t bmAttributes; /**< DFU attributes bit mask */ + le16_t wDetachTimeOut; /**< Time, in milliseconds, that the device will wait after receipt of the DFU_DETACH request */ + le16_t wTransferSize; /**< Maximum number of bytes that the device can accept per control-write transaction */ + le16_t bcdDFUVersion; /**< Numeric expression identifying the version of the DFU Specification release */ +} usb_dfu_func_desc_t; + +#define USB_DFU_FUNC_DESC_LEN 9 +#define USB_DFU_FUNC_DESC_TYPE 0x21 +#define USB_DFU_FUNC_DESC_BYTES(bmAttributes, wDetachTimeOut, wTransferSize, bcdDFUVersion) \ + USB_DFU_FUNC_DESC_LEN, /* bFunctionLength */ \ + USB_DFU_FUNC_DESC_TYPE, /* bDescriptorType */ \ + bmAttributes, \ + LE_BYTE0(wDetachTimeOut), LE_BYTE1(wDetachTimeOut), \ + LE_BYTE0(wTransferSize), LE_BYTE1(wTransferSize), \ + LE_BYTE0(bcdDFUVersion), LE_BYTE1(bcdDFUVersion) + +COMPILER_PACK_RESET() + +//! @} + +//! USB DFU Request IDs +enum usb_dfu_req { + USB_DFU_DETACH, + USB_DFU_DNLOAD, + USB_DFU_UPLOAD, + USB_DFU_GETSTATUS, + USB_DFU_CLRSTATUS, + USB_DFU_GETSTATE, + USB_DFU_ABORT, +}; + +//! USB DFU Device Status IDs +enum usb_dfu_status { + USB_DFU_STATUS_OK, + USB_DFU_STATUS_ERR_TARGET, + USB_DFU_STATUS_ERR_FILE, + USB_DFU_STATUS_ERR_WRITE, + USB_DFU_STATUS_ERR_ERASE, + USB_DFU_STATUS_ERR_CHECK_ERASED, + USB_DFU_STATUS_ERR_PROG, + USB_DFU_STATUS_ERR_VERIFY, + USB_DFU_STATUS_ERR_ADDRESS, + USB_DFU_STATUS_ERR_NOTDONE, + USB_DFU_STATUS_ERR_FIRMWARE, + USB_DFU_STATUS_ERR_VENDOR, + USB_DFU_STATUS_ERR_USBR, + USB_DFU_STATUS_ERR_POR, + USB_DFU_STATUS_ERR_UNKNOWN, + USB_DFU_STATUS_ERR_STALLEDPKT, +}; + +//! USB DFU Device State IDs +enum usb_dfu_state { + USB_DFU_STATE_APP_IDLE, + USB_DFU_STATE_APP_DETACH, + USB_DFU_STATE_DFU_IDLE, + USB_DFU_STATE_DFU_DNLOAD_SYNC, + USB_DFU_STATE_DFU_DNBUSY, + USB_DFU_STATE_DFU_DNLOAD_IDLE, + USB_DFU_STATE_DFU_MANIFEST_SYNC, + USB_DFU_STATE_DFU_MANIFEST, + USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET, + USB_DFU_STATE_DFU_UPLOAD_IDLE, + USB_DFU_STATE_DFU_ERROR, +}; + +#endif // _USB_PROTOCOL_DFU_H_ diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index 1c1672c..f737dc4 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -138,6 +138,8 @@ /* usbdc_register_funcion inside */ cdcdf_acm_init(); + dfudf_init(); + printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod); usbdc_start((struct usbd_descriptors *) usb_descs); usbdc_attach(); diff --git a/sysmoOCTSIM/usb_start.h b/sysmoOCTSIM/usb_start.h index a99d1ad..089c58d 100644 --- a/sysmoOCTSIM/usb_start.h +++ b/sysmoOCTSIM/usb_start.h @@ -15,6 +15,8 @@ #include "cdcdf_acm.h" #include "cdcdf_acm_desc.h" #include "ccid_df.h" +#include "dfudf.h" +#include "dfudf_desc.h" void usb_start(void); void cdc_device_acm_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 Gerrit-Change-Number: 17034 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:40:23 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 13:40:23 +0000 Subject: Change in osmo-ccid-firmware[master]: git version appended to the product usb string descriptor References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 ) Change subject: git version appended to the product usb string descriptor ...................................................................... git version appended to the product usb string descriptor Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 --- M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_start.c 2 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/35/17035/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 3db67d9..17255e2 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -365,6 +365,19 @@ return 0; } +static int str_to_usb_desc(char* in, uint8_t in_sz, uint8_t* out, uint8_t out_sz){ + if(2+in_sz*2 < out_sz) + return -1; + + memset(out, 0, out_sz); + out[0] = out_sz; + out[1] = 0x3; + for(int i= 2; i < out_sz; i+=2) + out[i] = in[(i >> 1) - 1]; + return 0; +} + + #define RSTCAUSE_STR_SIZE 64 static void get_rstcause_str(char *out) { @@ -436,13 +449,16 @@ //####################### #define NUM_OUT_BUF 16 -char sernr_buf[16*2+1]; -//unicode for descriptor -uint8_t sernr_buf_descr[1+1+16*2*2]; +char sernr_buf[16*2+1]; +char product_buf[] = "sysmoOCTSIM "GIT_VERSION; +//len, type, 2 byte per hex char * 2 for unicode +uint8_t sernr_buf_descr[1+1+16*2*2]; +uint8_t product_buf_descr[1+1+sizeof(product_buf)*2]; char rstcause_buf[RSTCAUSE_STR_SIZE]; + int main(void) { @@ -471,12 +487,12 @@ atmel_start_init(); get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); + str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); + + str_to_usb_desc(product_buf, sizeof(product_buf), product_buf_descr, sizeof(product_buf_descr)); get_rstcause_str(rstcause_buf); - sernr_buf_descr[0] = sizeof(sernr_buf_descr); - sernr_buf_descr[1] = 0x3; - for(int i= 2; i < sizeof(sernr_buf_descr); i+=2) - sernr_buf_descr[i] = sernr_buf[i >> 1]; + usb_start(); diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index f737dc4..d40ea75 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -89,6 +89,7 @@ } extern uint8_t sernr_buf_descr[]; +extern uint8_t product_buf_descr[]; /* call-back for every control EP request */ static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) { @@ -118,6 +119,8 @@ switch (index) { case STR_DESC_SERIAL: return send_str_desc(ep, req, stage, sernr_buf_descr); + case STR_DESC_PRODUCT: + return send_str_desc(ep, req, stage, product_buf_descr); default: return ERR_NOT_FOUND; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 Gerrit-Change-Number: 17035 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:46:09 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 13:46:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > @daniel can split the commits? Because you're fixing two different bugs here. Ok -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 13:46:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 13:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: Hello lynxis lazus, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 to look at the new patch set (#2). Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd We don't want to pass the test or return from this function before receiving a RAU accept. With Iu we expect a Security Mode Command/Complete before the routing area is updated, but we do want to wait for the actual RAU Accept or fail when receiving a RAU Reject. Change-Id: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Related: OS#3727 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/16983/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 13:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 to look at the new patch set (#3). Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash Depends: osmo-sgsn I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Change-Id: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Related: OS#3727 --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/16984/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 13:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 ) Change subject: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN ...................................................................... SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN Calling this function with Iu RAN (ran_index > 2) does not work because BSSGP_PROC[ran_index] doesn't exist. Change-Id: Ieef654e3886759a40763ece3903de9127ba8d9c6 Related: OS#3727 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/17036/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index f070429..800c978 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -677,7 +677,9 @@ /* update TLLI */ g_pars.tlli_old := g_pars.tlli; g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O; - f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + if (is_gb(ran_index)) { + f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + } } function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 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: Ieef654e3886759a40763ece3903de9127ba8d9c6 Gerrit-Change-Number: 17036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 13:47:25 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 13:47:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 3: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Tue, 28 Jan 2020 13:47:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 14:28:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 14:28:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 ) Change subject: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 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: Ieef654e3886759a40763ece3903de9127ba8d9c6 Gerrit-Change-Number: 17036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 14:28:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 14:28:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 14:28:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 14:28:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 14:46:33 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 14:46:33 +0000 Subject: Change in osmo-asf4-dfu[master]: usb serial number descriptor In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 to look at the new patch set (#2). Change subject: usb serial number descriptor ...................................................................... usb serial number descriptor Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da --- M config/usbd_config.h M usb_dfu_main.c M usb_start.c 3 files changed, 126 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/24/17024/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da Gerrit-Change-Number: 17024 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 14:50:02 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 14:50:02 +0000 Subject: Change in osmo-ccid-firmware[master]: support DFU detach to switch from fw to bootloader In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 to look at the new patch set (#2). Change subject: support DFU detach to switch from fw to bootloader ...................................................................... support DFU detach to switch from fw to bootloader This makes flashing a bit more convenient, because pushing the button is not required. It can be disabled using make DISABLE_DFU_DETACH=1. Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 --- M sysmoOCTSIM/dfu_descriptors.h M sysmoOCTSIM/gcc/Makefile A sysmoOCTSIM/usb/class/dfu/device/dfudf.c A sysmoOCTSIM/usb/class/dfu/device/dfudf.h A sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h A sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_start.c M sysmoOCTSIM/usb_start.h 8 files changed, 658 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/34/17034/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 Gerrit-Change-Number: 17034 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 14:50:03 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 14:50:03 +0000 Subject: Change in osmo-ccid-firmware[master]: usb dfu header cleanup References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 ) Change subject: usb dfu header cleanup ...................................................................... usb dfu header cleanup Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d --- M sysmoOCTSIM/usb/class/dfu/device/dfudf.c M sysmoOCTSIM/usb/class/dfu/device/dfudf.h D sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h D sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_dfu.h M sysmoOCTSIM/usb_start.h 6 files changed, 45 insertions(+), 319 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/37/17037/1 diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c index 2b11fb4..7a035da 100644 --- a/sysmoOCTSIM/usb/class/dfu/device/dfudf.c +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.c @@ -21,8 +21,8 @@ */ #include "dfudf.h" -#include "usb_protocol_dfu.h" -#include "dfudf_desc.h" +#include "usb_dfu.h" + /** USB Device DFU Function Specific Data */ struct dfudf_func_data { @@ -35,12 +35,8 @@ static struct usbdf_driver _dfudf; static struct dfudf_func_data _dfudf_funcd; -/** USB DFU functional descriptor (with DFU attributes) */ -static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB}; -static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes; - -enum usb_dfu_state dfu_state = USB_DFU_STATE_APP_IDLE; -enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; +enum dfu_state dfu_state = DFU_STATE_appIDLE; +enum usb_dfu_status dfu_status = DFU_STATUS_OK; uint8_t dfu_download_data[512]; uint16_t dfu_download_length = 0; @@ -68,7 +64,7 @@ ifc_desc.bInterfaceNumber = ifc[2]; ifc_desc.bInterfaceClass = ifc[5]; - if (USB_DFU_CLASS == ifc_desc.bInterfaceClass) { + if (0xfe == ifc_desc.bInterfaceClass) { if (func_data->func_iface == ifc_desc.bInterfaceNumber) { // Initialized return ERR_ALREADY_INITIALIZED; } else if (func_data->func_iface != 0xFF) { // Occupied @@ -104,7 +100,7 @@ if (desc) { ifc_desc.bInterfaceClass = desc->sod[5]; // Check interface - if (ifc_desc.bInterfaceClass != USB_DFU_CLASS) { + if (ifc_desc.bInterfaceClass != 0xfe) { return ERR_NOT_FOUND; } } @@ -156,7 +152,7 @@ uint8_t response[6]; // buffer for the response to this request switch (req->bRequest) { case USB_DFU_UPLOAD: // upload firmware from flash not supported - dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + dfu_state = DFU_STATE_dfuERROR; // unsupported class request to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) break; case USB_DFU_GETSTATUS: // get status @@ -167,24 +163,13 @@ response[4] = dfu_state; // set state response[5] = 0; // string not used to_return = usbdc_xfer(ep, response, 6, false); // send back status - if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) { // download has not completed - dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch to busy state - } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC == dfu_state) { - if (!dfu_manifestation_complete) { - dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go to manifest mode - } else if (usb_dfu_func_desc->bmAttributes & USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT) { - dfu_state = USB_DFU_STATE_DFU_IDLE; // go back to idle mode - } else { // this should not happen (after manifestation the state should be dfuMANIFEST-WAIT-RESET if we are not manifest tolerant) - dfu_state = USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET; // wait for reset - } - } break; case USB_DFU_GETSTATE: // get state response[0] = dfu_state; // return state to_return = usbdc_xfer(ep, response, 1, false); // send back state break; default: // all other DFU class IN request - dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or unsupported class request + dfu_state = DFU_STATE_dfuERROR; // unknown or unsupported class request to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) break; } @@ -205,7 +190,7 @@ switch (req->bRequest) { case USB_DFU_DETACH: // detach makes only sense in DFU run-time/application mode #if (DISABLE_DFU_DETACH != 0) - dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request + dfu_state = DFU_STATE_dfuERROR; // unsupported class request to_return = ERR_UNSUPPORTED_OP; // stall control pipe (don't reply to the request) #else to_return = usbdc_xfer(ep, NULL, 0, false); @@ -218,19 +203,19 @@ #endif break; case USB_DFU_CLRSTATUS: // clear status - if (USB_DFU_STATE_DFU_ERROR == dfu_state || USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error - dfu_status = USB_DFU_STATUS_OK; // clear error status - dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state + if (DFU_STATE_dfuERROR == dfu_state || DFU_STATUS_OK != dfu_status) { // only clear in case there is an error + dfu_status = DFU_STATUS_OK; // clear error status + dfu_state = DFU_STATE_dfuIDLE; // put back in idle state } to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK break; case USB_DFU_ABORT: // abort current operation dfu_download_offset = 0; // reset download progress - dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle state (nothing else to do) + dfu_state = DFU_STATE_dfuIDLE; // put back in idle state (nothing else to do) to_return = usbdc_xfer(ep, NULL, 0, false); // send ACK break; default: // all other DFU class OUT request - dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown class request + dfu_state = DFU_STATE_dfuERROR; // unknown class request to_return = ERR_INVALID_ARG; // stall control pipe (don't reply to the request) break; } diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h index cee5845..3a1be1e 100644 --- a/sysmoOCTSIM/usb/class/dfu/device/dfudf.h +++ b/sysmoOCTSIM/usb/class/dfu/device/dfudf.h @@ -35,10 +35,10 @@ #define USBDF_DFU_H_ #include "usbdc.h" -#include "usb_protocol_dfu.h" + /** Current DFU state */ -extern enum usb_dfu_state dfu_state; +extern enum dfu_state dfu_state; /**< Current DFU status */ extern enum usb_dfu_status dfu_status; diff --git a/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h b/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h deleted file mode 100644 index 50a79e4..0000000 --- a/sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h +++ /dev/null @@ -1,114 +0,0 @@ -/** - * \file - * - * \brief USB Device Stack DFU Function Descriptor Setting. - * - * Copyright (c) 2015-2018 Microchip Technology Inc. and its subsidiaries. - * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * \asf_license_start - * - * \page License - * - * Subject to your compliance with these terms, you may use Microchip - * software and any derivatives exclusively with Microchip products. - * It is your responsibility to comply with third party license terms applicable - * to your use of third party software (including open source software) that - * may accompany Microchip software. - * - * THIS SOFTWARE IS SUPPLIED BY MICROCHIP "AS IS". NO WARRANTIES, - * WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS SOFTWARE, - * INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY, - * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL MICROCHIP BE - * LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, INCIDENTAL OR CONSEQUENTIAL - * LOSS, DAMAGE, COST OR EXPENSE OF ANY KIND WHATSOEVER RELATED TO THE - * SOFTWARE, HOWEVER CAUSED, EVEN IF MICROCHIP HAS BEEN ADVISED OF THE - * POSSIBILITY OR THE DAMAGES ARE FORESEEABLE. TO THE FULLEST EXTENT - * ALLOWED BY LAW, MICROCHIP'S TOTAL LIABILITY ON ALL CLAIMS IN ANY WAY - * RELATED TO THIS SOFTWARE WILL NOT EXCEED THE AMOUNT OF FEES, IF ANY, - * THAT YOU HAVE PAID DIRECTLY TO MICROCHIP FOR THIS SOFTWARE. - * - * \asf_license_stop - */ - -#ifndef USBDF_DFU_DESC_H_ -#define USBDF_DFU_DESC_H_ - -#include "usb_protocol.h" -#include "usbd_config.h" -#include "usb_protocol_dfu.h" - -#define DFUD_DEV_DESC \ - USB_DEV_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ - CONF_USB_DFUD_BDEVICECLASS, \ - CONF_USB_DFUD_BDEVICESUBCLASS, \ - CONF_USB_DFUD_BDEVICEPROTOCOL, \ - CONF_USB_DFUD_BMAXPKSZ0, \ - CONF_USB_OPENMOKO_IDVENDOR, \ - CONF_USB_OSMOASF4DFU_IDPRODUCT, \ - CONF_USB_DFUD_BCDDEVICE, \ - CONF_USB_DFUD_IMANUFACT, \ - CONF_USB_DFUD_IPRODUCT, \ - CONF_USB_DFUD_ISERIALNUM, \ - CONF_USB_DFUD_BNUMCONFIG) - -#define DFUD_DEV_QUAL_DESC \ - USB_DEV_QUAL_DESC_BYTES(CONF_USB_DFUD_BCDUSB, \ - CONF_USB_DFUD_BDEVICECLASS, \ - CONF_USB_DFUD_BDEVICESUBCLASS, \ - CONF_USB_DFUD_BMAXPKSZ0, \ - CONF_USB_DFUD_BNUMCONFIG) - -#define DFUD_CFG_DESC \ - USB_CONFIG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ - CONF_USB_DFUD_BNUMINTERFACES, \ - CONF_USB_DFUD_BCONFIGVAL, \ - CONF_USB_DFUD_ICONFIG, \ - CONF_USB_DFUD_BMATTRI, \ - CONF_USB_DFUD_BMAXPOWER) - -#define DFUD_OTH_SPD_CFG_DESC \ - USB_OTH_SPD_CFG_DESC_BYTES(CONF_USB_DFUD_WTOTALLENGTH, \ - CONF_USB_DFUD_BNUMINTERFACES, \ - CONF_USB_DFUD_BCONFIGVAL, \ - CONF_USB_DFUD_ICONFIG, \ - CONF_USB_DFUD_BMATTRI, \ - CONF_USB_DFUD_BMAXPOWER) - -#define DFUD_IFACE_DESCB USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \ - 0, /**< detaching makes only sense in run-time mode */ \ - 512, /**< transfer size corresponds to page size for optimal flash writing */ \ - 0x0110 /**< DFU specification version 1.1 used */ ) - -#define DFUD_IFACE_DESCES \ - USB_IFACE_DESC_BYTES(CONF_USB_DFUD_BIFCNUM, \ - CONF_USB_DFUD_BALTSET, \ - CONF_USB_DFUD_BNUMEP, \ - USB_DFU_CLASS, \ - USB_DFU_SUBCLASS, \ - USB_DFU_PROTOCOL_DFU, \ - CONF_USB_DFUD_IINTERFACE), \ - DFUD_IFACE_DESCB - -#define DFUD_STR_DESCES \ - CONF_USB_DFUD_LANGID_DESC \ - CONF_USB_DFUD_IMANUFACT_STR_DESC \ - CONF_USB_DFUD_IPRODUCT_STR_DESC \ - CONF_USB_DFUD_ISERIALNUM_STR_DESC \ - CONF_USB_DFUD_ICONFIG_STR_DESC \ - CONF_USB_DFUD_IINTERFACE_STR_DESC - -/** USB Device descriptors and configuration descriptors */ -#define DFUD_DESCES_LS_FS \ - DFUD_DEV_DESC, DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_STR_DESCES - -#define DFUD_HS_DESCES_LS_FS \ - DFUD_DEV_DESC, DFUD_DEV_QUAL_DESC, DFUD_CFG_DESC, DFUD_M_IFACE_DESCES, \ - DFUD_IFACE_DESCES, DFUD_OTH_SPD_CFG_DESC, \ - DFUD_IFACE_DESCES_HS, DFUD_STR_DESCES - -#define DFUD_HS_DESCES_HS \ - DFUD_CFG_DESC, DFUD_IFACE_DESCES, DFUD_IFACE_DESCES_HS, DFUD_OTH_SPD_CFG_DESC, \ - DFUD_IFACE_DESCES - -#endif /* USBDF_DFU_DESC_H_ */ diff --git a/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h b/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h deleted file mode 100644 index 7f82743..0000000 --- a/sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h +++ /dev/null @@ -1,150 +0,0 @@ -/** - * \file - * - * \brief USB Device Firmware Upgrade (DFU) protocol definitions - * - * Copyright (c) 2018 sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef _USB_PROTOCOL_DFU_H_ -#define _USB_PROTOCOL_DFU_H_ - -#include "usb_includes.h" - -/* - * \ingroup usb_protocol_group - * \defgroup dfu_protocol_group Device Firmware Upgrade Definitions - * \implements USB Device Firmware Upgrade Specification, Revision 1.1 - * @{ - */ - -/** - * \name USB DFU Subclass IDs - */ -//@{ -#define USB_DFU_CLASS 0xFE //!< Application Specific Class Code -//@} - -//! \name USB DFU Subclass IDs -//@{ -#define USB_DFU_SUBCLASS 0x01 //!< Device Firmware Upgrade Code -//@} - -//! \name USB DFU Protocol IDs -//@{ -#define USB_DFU_PROTOCOL_RUNTIME 0x01 //!< Runtime protocol -#define USB_DFU_PROTOCOL_DFU 0x02 //!< DFU mode protocol -//@} - -//! \name USB DFU Attributes bits mask -//@{ -#define USB_DFU_ATTRIBUTES_CAN_DOWNLOAD 0x01 -#define USB_DFU_ATTRIBUTES_CAN_UPLOAD 0x02 -#define USB_DFU_ATTRIBUTES_MANIFEST_TOLERANT 0x04 -#define USB_DFU_ATTRIBUTES_WILL_DETACH 0x08 -//@} - -//! \name USB DFU Request IDs -//@{ -#define USB_REQ_DFU_DETACH 0x00 -#define USB_REQ_DFU_DNLOAD 0x01 -#define USB_REQ_DFU_UPLOAD 0x02 -#define USB_REQ_DFU_GETSTATUS 0x03 -#define USB_REQ_DFU_CLRSTATUS 0x04 -#define USB_REQ_DFU_GETSTATE 0x05 -#define USB_REQ_DFU_ABORT 0x06 -//@} - -/* - * Need to pack structures tightly, or the compiler might insert padding - * and violate the spec-mandated layout. - */ -COMPILER_PACK_SET(1) - -//! \name USB DFU Descriptors -//@{ - -//! DFU Functional Descriptor -typedef struct usb_dfu_func_desc { - uint8_t bFunctionLength; /**< Size of this descriptor, in bytes (always 9) */ - uint8_t bDescriptorType; /**< DFU FUNCTIONAL descriptor type (always 0x21) */ - uint8_t bmAttributes; /**< DFU attributes bit mask */ - le16_t wDetachTimeOut; /**< Time, in milliseconds, that the device will wait after receipt of the DFU_DETACH request */ - le16_t wTransferSize; /**< Maximum number of bytes that the device can accept per control-write transaction */ - le16_t bcdDFUVersion; /**< Numeric expression identifying the version of the DFU Specification release */ -} usb_dfu_func_desc_t; - -#define USB_DFU_FUNC_DESC_LEN 9 -#define USB_DFU_FUNC_DESC_TYPE 0x21 -#define USB_DFU_FUNC_DESC_BYTES(bmAttributes, wDetachTimeOut, wTransferSize, bcdDFUVersion) \ - USB_DFU_FUNC_DESC_LEN, /* bFunctionLength */ \ - USB_DFU_FUNC_DESC_TYPE, /* bDescriptorType */ \ - bmAttributes, \ - LE_BYTE0(wDetachTimeOut), LE_BYTE1(wDetachTimeOut), \ - LE_BYTE0(wTransferSize), LE_BYTE1(wTransferSize), \ - LE_BYTE0(bcdDFUVersion), LE_BYTE1(bcdDFUVersion) - -COMPILER_PACK_RESET() - -//! @} - -//! USB DFU Request IDs -enum usb_dfu_req { - USB_DFU_DETACH, - USB_DFU_DNLOAD, - USB_DFU_UPLOAD, - USB_DFU_GETSTATUS, - USB_DFU_CLRSTATUS, - USB_DFU_GETSTATE, - USB_DFU_ABORT, -}; - -//! USB DFU Device Status IDs -enum usb_dfu_status { - USB_DFU_STATUS_OK, - USB_DFU_STATUS_ERR_TARGET, - USB_DFU_STATUS_ERR_FILE, - USB_DFU_STATUS_ERR_WRITE, - USB_DFU_STATUS_ERR_ERASE, - USB_DFU_STATUS_ERR_CHECK_ERASED, - USB_DFU_STATUS_ERR_PROG, - USB_DFU_STATUS_ERR_VERIFY, - USB_DFU_STATUS_ERR_ADDRESS, - USB_DFU_STATUS_ERR_NOTDONE, - USB_DFU_STATUS_ERR_FIRMWARE, - USB_DFU_STATUS_ERR_VENDOR, - USB_DFU_STATUS_ERR_USBR, - USB_DFU_STATUS_ERR_POR, - USB_DFU_STATUS_ERR_UNKNOWN, - USB_DFU_STATUS_ERR_STALLEDPKT, -}; - -//! USB DFU Device State IDs -enum usb_dfu_state { - USB_DFU_STATE_APP_IDLE, - USB_DFU_STATE_APP_DETACH, - USB_DFU_STATE_DFU_IDLE, - USB_DFU_STATE_DFU_DNLOAD_SYNC, - USB_DFU_STATE_DFU_DNBUSY, - USB_DFU_STATE_DFU_DNLOAD_IDLE, - USB_DFU_STATE_DFU_MANIFEST_SYNC, - USB_DFU_STATE_DFU_MANIFEST, - USB_DFU_STATE_DFU_MANIFEST_WAIT_RESET, - USB_DFU_STATE_DFU_UPLOAD_IDLE, - USB_DFU_STATE_DFU_ERROR, -}; - -#endif // _USB_PROTOCOL_DFU_H_ diff --git a/sysmoOCTSIM/usb_dfu.h b/sysmoOCTSIM/usb_dfu.h index b447c7c..ee30a26 100644 --- a/sysmoOCTSIM/usb_dfu.h +++ b/sysmoOCTSIM/usb_dfu.h @@ -30,13 +30,16 @@ #define USB_DT_DFU_SIZE 9 /* DFU class-specific requests (Section 3, DFU Rev 1.1) */ -#define USB_REQ_DFU_DETACH 0x00 -#define USB_REQ_DFU_DNLOAD 0x01 -#define USB_REQ_DFU_UPLOAD 0x02 -#define USB_REQ_DFU_GETSTATUS 0x03 -#define USB_REQ_DFU_CLRSTATUS 0x04 -#define USB_REQ_DFU_GETSTATE 0x05 -#define USB_REQ_DFU_ABORT 0x06 +enum usb_dfu_req { + USB_DFU_DETACH, + USB_DFU_DNLOAD, + USB_DFU_UPLOAD, + USB_DFU_GETSTATUS, + USB_DFU_CLRSTATUS, + USB_DFU_GETSTATE, + USB_DFU_ABORT, +}; + struct dfu_status { uint8_t bStatus; @@ -45,22 +48,24 @@ uint8_t iString; } __attribute__((packed)); -#define DFU_STATUS_OK 0x00 -#define DFU_STATUS_errTARGET 0x01 -#define DFU_STATUS_errFILE 0x02 -#define DFU_STATUS_errWRITE 0x03 -#define DFU_STATUS_errERASE 0x04 -#define DFU_STATUS_errCHECK_ERASED 0x05 -#define DFU_STATUS_errPROG 0x06 -#define DFU_STATUS_errVERIFY 0x07 -#define DFU_STATUS_errADDRESS 0x08 -#define DFU_STATUS_errNOTDONE 0x09 -#define DFU_STATUS_errFIRMWARE 0x0a -#define DFU_STATUS_errVENDOR 0x0b -#define DFU_STATUS_errUSBR 0x0c -#define DFU_STATUS_errPOR 0x0d -#define DFU_STATUS_errUNKNOWN 0x0e -#define DFU_STATUS_errSTALLEDPKT 0x0f +enum usb_dfu_status { + DFU_STATUS_OK =0x00, + DFU_STATUS_errTARGET =0x01, + DFU_STATUS_errFILE =0x02, + DFU_STATUS_errWRITE =0x03, + DFU_STATUS_errERASE =0x04, + DFU_STATUS_errCHECK_ERASED =0x05, + DFU_STATUS_errPROG =0x06, + DFU_STATUS_errVERIFY =0x07, + DFU_STATUS_errADDRESS =0x08, + DFU_STATUS_errNOTDONE =0x09, + DFU_STATUS_errFIRMWARE =0x0a, + DFU_STATUS_errVENDOR =0x0b, + DFU_STATUS_errUSBR =0x0c, + DFU_STATUS_errPOR =0x0d, + DFU_STATUS_errUNKNOWN =0x0e, + DFU_STATUS_errSTALLEDPKT =0x0f, +}; enum dfu_state { DFU_STATE_appIDLE = 0, diff --git a/sysmoOCTSIM/usb_start.h b/sysmoOCTSIM/usb_start.h index 089c58d..12537bb 100644 --- a/sysmoOCTSIM/usb_start.h +++ b/sysmoOCTSIM/usb_start.h @@ -16,7 +16,7 @@ #include "cdcdf_acm_desc.h" #include "ccid_df.h" #include "dfudf.h" -#include "dfudf_desc.h" + void usb_start(void); void cdc_device_acm_init(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d Gerrit-Change-Number: 17037 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 15:14:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 15:14:29 +0000 Subject: Change in libosmo-netif[master]: stream: Re-arrange cli states to fix 100% cpu usage bug In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17030 ) Change subject: stream: Re-arrange cli states to fix 100% cpu usage bug ...................................................................... Patch Set 1: Verified+1 Code-Review+1 Fixes OS#4378 for me. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 Gerrit-Change-Number: 17030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 15:14:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 15:15:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 15:15:30 +0000 Subject: Change in libosmo-netif[master]: stream: Add new WAIT_RECONNECT cli state In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17031 ) Change subject: stream: Add new WAIT_RECONNECT cli state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 Gerrit-Change-Number: 17031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 15:15:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 15:16:33 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 15:16:33 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_ResetParameters fix References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 ) Change subject: PC_to_RDR_ResetParameters fix ...................................................................... PC_to_RDR_ResetParameters fix Change-Id: I1d89a704727baa0fd1d14eb6f17809c69cc0df67 --- M ccid_common/ccid_device.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/39/17039/1 diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 34fdcc8..9e72e11 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -480,6 +480,8 @@ /* copy default parameters from somewhere */ /* FIXME: T=1 */ + cs->proposed_pars = *cs->default_pars; + /* validate parameters; abort if they are not supported */ rc = cs->ci->slot_ops->set_params(cs, seq, CCID_PROTOCOL_NUM_T0, cs->default_pars); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1d89a704727baa0fd1d14eb6f17809c69cc0df67 Gerrit-Change-Number: 17039 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 15:16:33 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 28 Jan 2020 15:16:33 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_SetDataRateAndClockFrequency support References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 ) Change subject: PC_to_RDR_SetDataRateAndClockFrequency support ...................................................................... PC_to_RDR_SetDataRateAndClockFrequency support Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 --- M ccid_common/ccid_device.c M ccid_common/ccid_device.h M ccid_common/ccid_slot_fsm.c 3 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/38/17038/1 diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index b14f194..34fdcc8 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -649,7 +649,7 @@ int rc; /* FIXME: which rate to return in failure case? */ - rc = cs->ci->slot_ops->set_rate_and_clock(cs, freq_hz, rate_bps); + rc = cs->ci->slot_ops->set_rate_and_clock(cs, &freq_hz, &rate_bps); if (rc < 0) resp = ccid_gen_clock_and_rate(cs, seq, CCID_CMD_STATUS_FAILED, -rc, 9600, 2500000); else diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h index f364f72..bcf5d12 100644 --- a/ccid_common/ccid_device.h +++ b/ccid_common/ccid_device.h @@ -86,7 +86,7 @@ void (*set_clock)(struct ccid_slot *cs, enum ccid_clock_command cmd); int (*set_params)(struct ccid_slot *cs, uint8_t seq, enum ccid_protocol_num proto, const struct ccid_pars_decoded *pars_dec); - int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps); + int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps); void (*icc_set_insertion_status)(struct ccid_slot *cs, bool present); int (*handle_fsm_events)(struct ccid_slot *cs, bool enable); }; diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 08cbbad..747fef3 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -323,9 +323,14 @@ return 0; } -static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps) +static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps) { - /* we always acknowledge all rates/clocks */ + /* we return the currently used values, since we support automatic features */ + struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); + + *rate_bps = card_uart_ctrl(ss->cuart, CUART_CTL_GET_BAUDRATE, false); + *freq_hz = card_uart_ctrl(ss->cuart, CUART_CTL_GET_CLOCK_FREQ, false)/1000; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 Gerrit-Change-Number: 17038 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 16:11:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 28 Jan 2020 16:11:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 ) Change subject: SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN ...................................................................... SGSN_Tests: Only call f_bssgp_client_llgmm_assign for Gb RAN Calling this function with Iu RAN (ran_index > 2) does not work because BSSGP_PROC[ran_index] doesn't exist. Change-Id: Ieef654e3886759a40763ece3903de9127ba8d9c6 Related: OS#3727 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index f070429..800c978 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -677,7 +677,9 @@ /* update TLLI */ g_pars.tlli_old := g_pars.tlli; g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O; - f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + if (is_gb(ran_index)) { + f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[ran_index]); + } } function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17036 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: Ieef654e3886759a40763ece3903de9127ba8d9c6 Gerrit-Change-Number: 17036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 17:18:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 17:18:40 +0000 Subject: Change in osmo-msc[master]: osmo-msc: use stderr to print error messages, not stdout References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/17040 ) Change subject: osmo-msc: use stderr to print error messages, not stdout ...................................................................... osmo-msc: use stderr to print error messages, not stdout Change-Id: I702dd054d2e881b526f701ca482ec0f64ba8da28 --- M src/osmo-msc/msc_main.c 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/17040/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index dc6b684..cf1e504 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -609,20 +610,20 @@ msc_network->ctrl = ctrl_interface_setup_dynip(msc_network, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_MSC, NULL); if (!msc_network->ctrl) { - printf("Failed to initialize control interface. Exiting.\n"); + fprintf(stderr, "Failed to initialize control interface. Exiting.\n"); return -1; } #if 0 TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_install(). if (bsc_base_ctrl_cmds_install() != 0) { - printf("Failed to initialize the BSC control commands.\n"); + fprintf(stderr, "Failed to initialize the BSC control commands.\n"); return -1; } #endif if (msc_ctrl_cmds_install(msc_network) != 0) { - printf("Failed to initialize the MSC control commands.\n"); + fprintf(stderr, "Failed to initialize the MSC control commands.\n"); return -1; } @@ -632,8 +633,8 @@ * should try to use the nanoseconds part of the current time. */ if (db_init(msc_cmdline_config.database_name)) { - printf("DB: Failed to init database: %s\n", - msc_cmdline_config.database_name); + fprintf(stderr, "DB: Failed to init database: %s\n", + msc_cmdline_config.database_name); return 4; } @@ -650,7 +651,7 @@ } if (db_prepare()) { - printf("DB: Failed to prepare database.\n"); + fprintf(stderr, "DB: Failed to prepare database.\n"); return 5; } @@ -669,17 +670,17 @@ msc_network, &msc_network->mgw.conf); if (mgcp_client_connect(msc_network->mgw.client)) { - printf("MGCPGW connect failed\n"); + fprintf(stderr, "MGCPGW connect failed\n"); return 7; } if (ss7_setup(tall_msc_ctx, &sccp_a, &sccp_iu)) { - printf("Setting up SCCP client failed.\n"); + fprintf(stderr, "Setting up SCCP client failed.\n"); return 8; } if (sgs_server_open(g_sgs)) { - printf("Starting SGs server failed\n"); + fprintf(stderr, "Starting SGs server failed\n"); return 9; } @@ -687,7 +688,7 @@ "OsmoMSC-A", &msc_ran_infra[OSMO_RAT_GERAN_A], msc_network); if (!msc_network->a.sri) { - printf("Setting up A receiver failed\n"); + fprintf(stderr, "Setting up A receiver failed\n"); return 10; } LOGP(DMSC, LOGL_NOTICE, "A-interface: SCCP user %s, cs7-instance %u (%s)\n", @@ -702,7 +703,7 @@ "OsmoMSC-IuCS", &msc_ran_infra[OSMO_RAT_UTRAN_IU], msc_network); if (!msc_network->iu.sri) { - printf("Setting up IuCS receiver failed\n"); + fprintf(stderr, "Setting up IuCS receiver failed\n"); return 11; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I702dd054d2e881b526f701ca482ec0f64ba8da28 Gerrit-Change-Number: 17040 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:22 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: #if 0 unused stuff References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17041 ) Change subject: gsm_rlcmac.h: #if 0 unused stuff ...................................................................... gsm_rlcmac.h: #if 0 unused stuff Port of wireshark.git 2ef0c615946cd290aa9463c637169da0a1ca7972. Ported-by: Pau Espin Pedrol Change-Id: Ia2e80664d293a2a95372213b4164c3e72259e0bb --- M src/gsm_rlcmac.h 1 file changed, 107 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/17041/1 diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 0ac1207..6c82669 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -216,7 +216,7 @@ typedef struct { guint8 TMSI[TMSI_LEN]; -}TMSI_t; +} TMSI_t; typedef guint16 CellId_t; @@ -355,6 +355,7 @@ } Id; }; +#if 0 struct OV_MobileId /* Struct for optional mobile identity */ { unsigned char IEI; @@ -368,7 +369,7 @@ LAI_PRIORITY_AVAILABLE, LAI_PRIORITY_FORBIDDEN, LAI_PRIORITY_FORCED -}LAI_Priority_t; +} LAI_Priority_t; typedef enum { @@ -378,33 +379,34 @@ NOM_GSM, NOM_PS_ONLY, NOM_UNKNOWN -}NMO_t; +} NMO_t; typedef enum { COMBINED, NOT_COMBINED, SAME_AS_BEFORE -}ProcedureMode_t; +} ProcedureMode_t; typedef struct { guint8 Cause; LAI_t LAI; struct OV_MobileId MobileId; -}CombinedResult_t; +} CombinedResult_t; typedef enum { R97, R99 -}MSCR_t, SGSNR_t; +} MSCR_t, SGSNR_t; typedef struct { guint8 NbrOfElements; PLMN_t Element[MAX_ELEMENTS_IN_EQPLMN_LIST]; -}EqPLMN_List_t; +} EqPLMN_List_t; +#endif #define MAX_PCCCH 16 #define MAX_RFL_LENGTH 16 /* length of RFL in PSI2 */ @@ -485,11 +487,13 @@ /* * */ +#if 0 #define SF_VBS 0 /* VBS (broadcast call reference) */ #define SF_VGCS 1 /* VGCS (group call reference) */ #define AF_AckIsNotRequired 0 /* acknowledgement is not required */ #define AF_AckIsRequired 1 /* acknowledgement is required */ +#endif typedef struct { @@ -821,6 +825,7 @@ } u; } IA_PacketAssignment_t; +#if 0 typedef struct { guint8 UnionType; @@ -855,7 +860,7 @@ { ExtendedRA_Info_Array_t ExtendedRA_Info; } IAR_t; - +#endif /* Packet Polling Request */ typedef struct @@ -886,6 +891,7 @@ guint8 Extension_Info[MAX_EXTENSION_LENGTH_IN_BYTES];/* ( val (extension length)+1 ) 04.60/12.26 */ } Extension_Bits_t; +#if 0 typedef struct { guint8 DTM_SUPPORT : 1; @@ -935,7 +941,7 @@ GPRS_ExtensionInfoWithEGPRS_t GPRS_ExtensionInfoWithEGPRS; GPRS_ExtensionInfoWithoutEGPRS_t GPRS_ExtensionInfoWithoutEGPRS; NonGPRS_ExtensionInfo_t NonGPRS_ExtensionInfo; - guint8 Extension_Information[MAX_EXTENSION_LENGTH_IN_BYTES]; + guint8 Extension_Information[MAX_EXTENSION_LENGTH_IN_BYTES]; } u; } Optional_Extension_Information_t; @@ -945,7 +951,7 @@ guint8 BEP_PERIOD; gboolean EGPRS_PACKET_CHANNEL_REQUEST; } EGPRS_OptionalExtensionInformation_t; - +#endif typedef struct { @@ -1010,14 +1016,16 @@ /* < Packet TBF Release message content > */ typedef guint8 TBF_RELEASE_CAUSE_t; +#if 0 #define TBF_RELEASE_CAUSE_NORMAL (0x00) #define TBF_RELEASE_CAUSE_ABNORMAL (0x02) +#endif typedef struct { guint8 MESSAGE_TYPE; guint8 PAGE_MODE; - Global_TFI_t Global_TFI; + Global_TFI_t Global_TFI; guint8 UPLINK_RELEASE; guint8 DOWNLINK_RELEASE; TBF_RELEASE_CAUSE_t TBF_RELEASE_CAUSE; @@ -1055,10 +1063,12 @@ typedef Packet_Control_Acknowledgement_t Packet_Ctrl_Ack_t; +#if 0 typedef struct { guint8 CTRL_ACK; } Packet_Control_Acknowledgement_11_bit_t, Packet_Control_Acknowledgement_8_bit_t; +#endif /* < Packet Downlink Dummy Control Block message content > */ typedef struct @@ -1201,11 +1211,13 @@ AccTech_GSMOther = 0xf } AccessTechnology_t; +#if 0 typedef struct { guint8 CountAccessTechnologies; AccessTechnology_t AccessTechnologies[MAX_ACCESS_TECHNOLOGIES_COUNT]; } AccessTechnologiesRequest_t; +#endif typedef struct { @@ -1567,14 +1579,14 @@ guint8 Exist_Measurement_Bandwidth; guint8 Measurement_Bandwidth; guint16 Physical_Layer_Cell_Identity; -}EUTRAN_Target_Cell_t; +} EUTRAN_Target_Cell_t; typedef struct { guint32 UTRAN_CI; guint8 Exist_PLMN_ID; PLMN_t PLMN_ID; -}UTRAN_CSG_Target_Cell_t; +} UTRAN_CSG_Target_Cell_t; typedef struct { @@ -1582,7 +1594,7 @@ guint16 Tracking_Area_Code; guint8 Exist_PLMN_ID; PLMN_t PLMN_ID; -}EUTRAN_CSG_Target_Cell_t; +} EUTRAN_CSG_Target_Cell_t; typedef struct { @@ -1590,7 +1602,7 @@ UTRAN_CSG_Target_Cell_t UTRAN_CSG_Target_Cell; guint8 Exist_EUTRAN_CSG_Target_Cell; EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; -}PCCF_AdditionsR9_t; +} PCCF_AdditionsR9_t; typedef struct { @@ -1598,7 +1610,7 @@ EUTRAN_Target_Cell_t EUTRAN_Target_Cell; guint8 Exist_AdditionsR9; PCCF_AdditionsR9_t AdditionsR9; -}PCCF_AdditionsR8_t; +} PCCF_AdditionsR8_t; typedef struct { @@ -1767,11 +1779,13 @@ } u; } PU_AckNack_EGPRS_t; +#if 0 enum PUAN_Type { PUAN_GPRS, PUAN_EGPRS }; +#endif typedef struct { @@ -2048,11 +2062,13 @@ } u; } PUA_EGPRS_t; +#if 0 enum PUA_Type { PUA_GPRS, PUA_EGPRS }; +#endif typedef struct { @@ -2098,7 +2114,7 @@ typedef struct { DTM_Packet_Uplink_Assignment_t DTM_Packet_Uplink_Assignment; -}DTM_UL_t; +} DTM_UL_t; /* < DTM Packet Channel Request message content > */ typedef struct @@ -2107,7 +2123,7 @@ Channel_Request_Description_t Channel_Request_Description; gboolean Exist_PFI; guint8 PFI; -}DTM_Channel_Request_Description_t; +} DTM_Channel_Request_Description_t; /* < Packet Downlink Assignment message content > */ typedef struct @@ -2213,18 +2229,18 @@ typedef struct { DTM_Packet_Downlink_Assignment_t DTM_Packet_Downlink_Assignment; -}DTM_DL_t; +} DTM_DL_t; typedef struct { GPRS_Cell_Options_t GPRS_Cell_Options; GPRS_Power_Control_Parameters_t GPRS_Power_Control_Parameters; -}DTM_GPRS_Broadcast_Information_t; +} DTM_GPRS_Broadcast_Information_t; typedef struct { DTM_GPRS_Broadcast_Information_t DTM_GPRS_Broadcast_Information; -}DTM_GPRS_B_t; +} DTM_GPRS_B_t; /* < Packet Paging Request message content > */ typedef struct @@ -2275,7 +2291,7 @@ guint8 Count_Repeated_Page_info; Repeated_Page_info_t Repeated_Page_info[5]; -} Packet_Paging_Request_t; +} Packet_Paging_Request_t; typedef struct { @@ -2430,11 +2446,13 @@ } u; } PTR_EGPRS_t; +#if 0 enum PTR_Type { PTR_GPRS, PTR_EGPRS }; +#endif typedef struct { @@ -2739,14 +2757,14 @@ guint8 TIME_GROUP; guint8 Exist_GUAR_CONSTANT_PWR_BLKS; guint8 GUAR_CONSTANT_PWR_BLKS; -}COMPACT_Cell_Sel_t; +} COMPACT_Cell_Sel_t; typedef struct { guint8 FREQ_DIFF_LENGTH; guint16 FREQUENCY_DIFF; COMPACT_Cell_Sel_t COMPACT_Cell_Sel_Remain_Cells; -}COMPACT_Neighbour_Cell_Param_Remaining_t; +} COMPACT_Neighbour_Cell_Param_Remaining_t; typedef struct { @@ -2755,20 +2773,20 @@ guint8 NR_OF_REMAINING_CELLS; guint8 FREQ_DIFF_LENGTH; COMPACT_Neighbour_Cell_Param_Remaining_t COMPACT_Neighbour_Cell_Param_Remaining[16]; -}COMPACT_Neighbour_Cell_Param_t; +} COMPACT_Neighbour_Cell_Param_t; typedef struct { Cell_Identification_t Cell_Identification; guint8 COMPACT_Neighbour_Cell_Param_Count; COMPACT_Neighbour_Cell_Param_t COMPACT_Neighbour_Cell_Param[8]; -}COMPACT_Info_t; +} COMPACT_Info_t; typedef struct { guint8 Exist_CCN_Support_Desc; CCN_Support_Description_t CCN_Support_Desc; -}PSI3_AdditionR4_t; +} PSI3_AdditionR4_t; typedef struct { @@ -2776,7 +2794,7 @@ COMPACT_Info_t COMPACT_Info; guint8 Exist_AdditionR4; PSI3_AdditionR4_t AdditionR4; -}PSI3_AdditionR99_t; +} PSI3_AdditionR99_t; typedef struct { @@ -2785,7 +2803,7 @@ LSA_Parameters_t LSA_Parameters; guint8 Exist_AdditionR99; PSI3_AdditionR99_t AdditionR99; -}PSI3_AdditionR98_t; +} PSI3_AdditionR98_t; typedef struct { @@ -2884,7 +2902,7 @@ guint8 INVALID_BSIC_REPORTING; guint8 Exist_NCC_PERMITTED; guint8 NCC_PERMITTED; - + gboolean Exist_GPRSMeasurementParams; MeasurementParams_t GPRSMeasurementParams; gboolean Exist_GPRSMeasurementParams3G; @@ -2897,7 +2915,7 @@ OffsetThreshold_t OffsetThreshold_700; guint8 Exist_OffsetThreshold_810; OffsetThreshold_t OffsetThreshold_810; -}PSI5_AdditionsR7; +} PSI5_AdditionsR7; typedef struct { @@ -2905,7 +2923,7 @@ GPRS_AdditionalMeasurementParams3G_t GPRS_AdditionalMeasurementParams3G; guint8 Exist_AdditionsR7; PSI5_AdditionsR7 AdditionsR7; -}PSI5_AdditionsR5; +} PSI5_AdditionsR5; typedef struct { @@ -2913,7 +2931,7 @@ ENH_Reporting_Parameters_t ENH_Reporting_Param; guint8 Exist_AdditionsR5; PSI5_AdditionsR5 AdditionisR5; -}PSI5_AdditionsR99; +} PSI5_AdditionsR99; typedef struct { @@ -3197,7 +3215,7 @@ guint32 CSG_ID; gboolean Access_Mode; guint8 REPORTING_QUANTITY; -}UTRAN_CSG_Measurement_Report_t; +} UTRAN_CSG_Measurement_Report_t; typedef struct { @@ -3208,7 +3226,7 @@ guint32 CSG_ID; gboolean Access_Mode; guint8 REPORTING_QUANTITY; -}EUTRAN_CSG_Measurement_Report_t; +} EUTRAN_CSG_Measurement_Report_t; typedef struct { @@ -3216,20 +3234,20 @@ UTRAN_CSG_Measurement_Report_t UTRAN_CSG_Meas_Rpt; gboolean Exist_EUTRAN_CSG_Meas_Rpt; EUTRAN_CSG_Measurement_Report_t EUTRAN_CSG_Meas_Rpt; -}PMR_AdditionsR9_t; +} PMR_AdditionsR9_t; typedef struct { guint8 EUTRAN_FREQUENCY_INDEX; guint16 CELL_IDENTITY; guint8 REPORTING_QUANTITY; -}EUTRAN_Measurement_Report_Body_t; +} EUTRAN_Measurement_Report_Body_t; typedef struct { guint8 N_EUTRAN; EUTRAN_Measurement_Report_Body_t Report[4]; -}EUTRAN_Measurement_Report_t; +} EUTRAN_Measurement_Report_t; typedef struct { @@ -3237,7 +3255,7 @@ EUTRAN_Measurement_Report_t EUTRAN_Meas_Rpt; gboolean Exist_AdditionsR9; PMR_AdditionsR9_t AdditionsR9; -}PMR_AdditionsR8_t; +} PMR_AdditionsR8_t; typedef struct { @@ -3245,7 +3263,7 @@ guint8 GRNTI; gboolean Exist_AdditionsR8; PMR_AdditionsR8_t AdditionsR8; -}PMR_AdditionsR5_t; +} PMR_AdditionsR5_t; typedef struct { @@ -3327,14 +3345,14 @@ guint8 Exist_UTRAN_CSG_Target_Cell; UTRAN_CSG_Target_Cell_t UTRAN_CSG_Target_Cell; guint8 Exist_EUTRAN_CSG_Target_Cell; - EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; -}PEMR_AdditionsR9_t; + EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; +} PEMR_AdditionsR9_t; typedef struct { gboolean Exist_REPORTING_QUANTITY; guint8 REPORTING_QUANTITY; -}Bitmap_Report_Quantity_t; +} Bitmap_Report_Quantity_t; typedef struct { @@ -3344,7 +3362,7 @@ EUTRAN_Measurement_Report_t EUTRAN_Meas_Rpt; gboolean Exist_AdditionsR9; PEMR_AdditionsR9_t AdditionsR9; -}PEMR_AdditionsR8_t; +} PEMR_AdditionsR8_t; typedef struct { @@ -3352,7 +3370,7 @@ guint8 GRNTI_Ext; gboolean Exist_AdditionsR8; PEMR_AdditionsR8_t AdditionsR8; -}PEMR_AdditionsR5_t; +} PEMR_AdditionsR5_t; typedef struct { @@ -3400,7 +3418,7 @@ guint8 BANDWITH_TDD; guint8 CELL_PARAMETER; guint8 Sync_Case_TSTD; -}TDD_Target_Cell_Notif_t; +} TDD_Target_Cell_Notif_t; typedef struct { @@ -3418,21 +3436,21 @@ guint8 Measurement_Bandwidth; guint16 Physical_Layer_Cell_Identity; guint8 Reporting_Quantity; -}Target_EUTRAN_Cell_Notif_t; +} Target_EUTRAN_Cell_Notif_t; typedef struct { guint8 EUTRAN_FREQUENCY_INDEX; guint16 CELL_IDENTITY; guint8 REPORTING_QUANTITY; -}Eutran_Ccn_Measurement_Report_Cell_t; +} Eutran_Ccn_Measurement_Report_Cell_t; typedef struct { gboolean ThreeG_BA_USED; guint8 N_EUTRAN; Eutran_Ccn_Measurement_Report_Cell_t Eutran_Ccn_Measurement_Report_Cell[4]; -}Eutran_Ccn_Measurement_Report_t; +} Eutran_Ccn_Measurement_Report_t; typedef struct { @@ -3445,7 +3463,7 @@ Target_EUTRAN_Cell_Notif_t Target_EUTRAN_Cell; guint8 Exist_Eutran_Ccn_Measurement_Report; Eutran_Ccn_Measurement_Report_t Eutran_Ccn_Measurement_Report; -}Target_Cell_4G_Notif_t; +} Target_Cell_4G_Notif_t; typedef struct { @@ -3457,7 +3475,7 @@ } u; guint8 Exist_Eutran_Ccn_Measurement_Report; Eutran_Ccn_Measurement_Report_t Eutran_Ccn_Measurement_Report; -}Target_Cell_CSG_Notif_t; +} Target_Cell_CSG_Notif_t; typedef struct { @@ -3467,7 +3485,7 @@ Target_Cell_4G_Notif_t Target_Cell_4G_Notif; Target_Cell_CSG_Notif_t Target_Cell_CSG_Notif; } u; -}Target_Other_RAT_2_Notif_t; +} Target_Other_RAT_2_Notif_t; typedef struct { @@ -3477,8 +3495,8 @@ Target_Cell_3G_Notif_t Target_Cell_3G_Notif; Target_Other_RAT_2_Notif_t Target_Other_RAT_2_Notif; } u; - -}Target_Other_RAT_Notif_t; + +} Target_Other_RAT_Notif_t; typedef struct { @@ -4036,7 +4054,7 @@ guint8 PSC_Pattern_length; guint8 PSC_Pattern; gboolean PSC_Pattern_sense; -}PSC_Pattern_t; +} PSC_Pattern_t; typedef struct { @@ -4044,33 +4062,33 @@ guint16 PSC[32]; guint8 PSC_Pattern_Count; PSC_Pattern_t PSC_Pattern[32]; -}PSC_Group_t; +} PSC_Group_t; typedef struct { PSC_Group_t CSG_PSC_SPLIT; guint8 Count; guint8 UTRAN_FREQUENCY_INDEX[32]; -}ThreeG_CSG_Description_Body_t; +} ThreeG_CSG_Description_Body_t; typedef struct { guint8 Count; ThreeG_CSG_Description_Body_t ThreeG_CSG_Description_Body[32]; -}ThreeG_CSG_Description_t; +} ThreeG_CSG_Description_t; typedef struct { PSC_Group_t CSG_PCI_SPLIT; guint8 Count; guint8 EUTRAN_FREQUENCY_INDEX[32]; -}EUTRAN_CSG_Description_Body_t; +} EUTRAN_CSG_Description_Body_t; typedef struct { guint8 Count; EUTRAN_CSG_Description_Body_t EUTRAN_CSG_Description_Body[32]; -}EUTRAN_CSG_Description_t; +} EUTRAN_CSG_Description_t; typedef struct { @@ -4079,13 +4097,13 @@ guint8 EUTRAN_FREQUENCY_INDEX_top; guint8 Count_EUTRAN_FREQUENCY_INDEX; guint8 EUTRAN_FREQUENCY_INDEX[32]; - + gboolean existMeasurement_Control_UTRAN; gboolean Measurement_Control_UTRAN; guint8 UTRAN_FREQUENCY_INDEX_top; guint8 Count_UTRAN_FREQUENCY_INDEX; guint8 UTRAN_FREQUENCY_INDEX[32]; -}Meas_Ctrl_Param_Desp_t; +} Meas_Ctrl_Param_Desp_t; typedef struct { @@ -4096,7 +4114,7 @@ guint8 EUTRAN_QQUALMIN; gboolean existEUTRAN_RSRPmin; guint8 EUTRAN_RSRPmin; -}Reselection_Based_On_RSRQ_t; +} Reselection_Based_On_RSRQ_t; typedef struct { @@ -4108,13 +4126,13 @@ guint8 EUTRAN_Qmin; Reselection_Based_On_RSRQ_t Reselection_Based_On_RSRQ; } u; -}Rept_EUTRAN_Enh_Cell_Resel_Param_t; +} Rept_EUTRAN_Enh_Cell_Resel_Param_t; typedef struct { guint8 Count; Rept_EUTRAN_Enh_Cell_Resel_Param_t Repeated_EUTRAN_Enhanced_Cell_Reselection_Parameters[32]; -}Enh_Cell_Reselect_Param_Desp_t; +} Enh_Cell_Reselect_Param_Desp_t; typedef struct { @@ -4123,7 +4141,7 @@ guint8 UTRAN_CSG_FDD_REPORTING_THRESHOLD_2; gboolean existUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 UTRAN_CSG_TDD_REPORTING_THRESHOLD; -}UTRAN_CSG_Cells_Reporting_Desp_t; +} UTRAN_CSG_Cells_Reporting_Desp_t; typedef struct { @@ -4133,7 +4151,7 @@ gboolean existEUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 EUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 EUTRAN_CSG_TDD_REPORTING_THRESHOLD_2; -}EUTRAN_CSG_Cells_Reporting_Desp_t; +} EUTRAN_CSG_Cells_Reporting_Desp_t; typedef struct { @@ -4141,33 +4159,33 @@ UTRAN_CSG_Cells_Reporting_Desp_t UTRAN_CSG_Cells_Reporting_Description; gboolean existEUTRAN_CSG_Cells_Reporting_Description; EUTRAN_CSG_Cells_Reporting_Desp_t EUTRAN_CSG_Cells_Reporting_Description; -}CSG_Cells_Reporting_Desp_t; +} CSG_Cells_Reporting_Desp_t; typedef struct { gboolean existEnhanced_Cell_Reselection_Parameters_Description; Enh_Cell_Reselect_Param_Desp_t Enhanced_Cell_Reselection_Parameters_Description; - + gboolean existCSG_Cells_Reporting_Description; CSG_Cells_Reporting_Desp_t CSG_Cells_Reporting_Description; -}PMO_AdditionsR9_t; +} PMO_AdditionsR9_t; typedef struct { guint8 dummy; -}Delete_All_Stored_Individual_Priorities_t; +} Delete_All_Stored_Individual_Priorities_t; typedef struct { guint8 Count; guint16 FDD_ARFCN[32]; -}Individual_UTRAN_Priority_FDD_t; +} Individual_UTRAN_Priority_FDD_t; typedef struct { guint8 Count; guint16 TDD_ARFCN[32]; -}Individual_UTRAN_Priority_TDD_t; +} Individual_UTRAN_Priority_TDD_t; typedef struct { @@ -4178,7 +4196,7 @@ Individual_UTRAN_Priority_TDD_t Individual_UTRAN_Priority_TDD; } u; guint8 UTRAN_PRIORITY; -}Repeated_Individual_UTRAN_Priority_Parameters_t; +} Repeated_Individual_UTRAN_Priority_Parameters_t; typedef struct { @@ -4186,14 +4204,14 @@ guint8 DEFAULT_UTRAN_PRIORITY; guint8 Repeated_Individual_UTRAN_Priority_Parameters_Count; Repeated_Individual_UTRAN_Priority_Parameters_t Repeated_Individual_UTRAN_Priority_Parameters[32]; -}ThreeG_Individual_Priority_Parameters_Description_t; +} ThreeG_Individual_Priority_Parameters_Description_t; typedef struct { guint8 Count; guint16 EARFCN[32]; guint8 EUTRAN_PRIORITY; -}Repeated_Individual_EUTRAN_Priority_Parameters_t; +} Repeated_Individual_EUTRAN_Priority_Parameters_t; typedef struct { @@ -4201,7 +4219,7 @@ guint8 DEFAULT_EUTRAN_PRIORITY; guint8 Count; Repeated_Individual_EUTRAN_Priority_Parameters_t Repeated_Individual_EUTRAN_Priority_Parameters[32]; -}EUTRAN_Individual_Priority_Parameters_Description_t; +} EUTRAN_Individual_Priority_Parameters_Description_t; typedef struct { @@ -4212,7 +4230,7 @@ EUTRAN_Individual_Priority_Parameters_Description_t EUTRAN_Individual_Priority_Parameters_Description; guint8 Exist_T3230_timeout_value; guint8 T3230_timeout_value; -}Provide_Individual_Priorities_t; +} Provide_Individual_Priorities_t; typedef struct { @@ -4222,7 +4240,7 @@ Delete_All_Stored_Individual_Priorities_t Delete_All_Stored_Individual_Priorities; Provide_Individual_Priorities_t Provide_Individual_Priorities; } u; -}Individual_Priorities_t; +} Individual_Priorities_t; typedef struct { @@ -4375,7 +4393,7 @@ EUTRAN_Target_Cell_t EUTRAN_Target_Cell; guint8 Exist_Individual_Priorities; Individual_Priorities_t Individual_Priorities; -}Target_Cell_3G_AdditionsR8_t; +} Target_Cell_3G_AdditionsR8_t; typedef struct { @@ -4383,7 +4401,7 @@ guint8 G_RNTI_Extention; guint8 Exist_AdditionsR8; Target_Cell_3G_AdditionsR8_t AdditionsR8; -}Target_Cell_3G_AdditionsR5_t; +} Target_Cell_3G_AdditionsR5_t; typedef struct { @@ -4397,8 +4415,10 @@ Target_Cell_3G_AdditionsR5_t AdditionsR5; } Target_Cell_3G_t; +#if 0 #define TARGET_CELL_GSM 0 #define TARGET_CELL_3G 1 +#endif typedef struct { @@ -4661,7 +4681,7 @@ GlobalTimeslotDescription_UA_t GTD_UA; guint8 Exist_DownlinkTBF; DownlinkTBF_t DownlinkTBF; -}PHO_EGPRS_t; +} PHO_EGPRS_t; typedef struct { @@ -4944,7 +4964,7 @@ Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; + EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; Packet_Measurement_Report_t Packet_Measurement_Report; Packet_Resource_Request_t Packet_Resource_Request; @@ -4953,8 +4973,8 @@ Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; Packet_SI_Status_t Packet_SI_Status; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - Packet_Pause_t Packet_Pause; + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; + Packet_Pause_t Packet_Pause; } u; gint16 NrOfBits; } RlcMacUplink_t; @@ -5058,9 +5078,10 @@ guint8 SI13_POSITION; } SI4_Rest_Octet_t; +#if 0 typedef SI4_Rest_Octet_t SI7_Rest_Octet_t; typedef SI4_Rest_Octet_t SI8_Rest_Octet_t; - +#endif /* SI6_RestOctet_t */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2e80664d293a2a95372213b4164c3e72259e0bb Gerrit-Change-Number: 17041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:24 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacD... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17042 ) Change subject: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call ...................................................................... gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call Port from wireshark.git commit 6c32ba5ff1a5f5ec2426d1d2c4f4f37fd136bab0. Ported-by: Pau Espin Pedrol Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a --- M src/gsm_rlcmac.h 1 file changed, 35 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/17042/1 diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 6c82669..196ced2 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -4900,35 +4900,45 @@ union { guint8 MESSAGE_TYPE; - - Packet_Access_Reject_t Packet_Access_Reject; - Packet_Cell_Change_Order_t Packet_Cell_Change_Order; - Packet_Downlink_Assignment_t Packet_Downlink_Assignment; - Packet_Measurement_Order_Reduced_t Packet_Measurement_Order; - Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; - Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; - Packet_Paging_Request_t Packet_Paging_Request; - Packet_PDCH_Release_t Packet_PDCH_Release; - Packet_Polling_Request_t Packet_Polling_Request; - Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; - Packet_PRACH_Parameters_t Packet_PRACH_Parameters; - Packet_Queueing_Notification_t Packet_Queueing_Notification; - Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; - Packet_TBF_Release_t Packet_TBF_Release; - Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; - Packet_Uplink_Assignment_t Packet_Uplink_Assignment; - Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; - Packet_Handover_Command_t Packet_Handover_Command; - Packet_PhysicalInformation_t Packet_PhysicalInformation; - Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; - + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; + EGPRS_PD_AckNack_t EGPRS_PD_AckNack; + PSI13_t PSI13; PSI1_t PSI1; PSI2_t PSI2; PSI3_t PSI3; - PSI3_BIS_t PSI3_BIS; - PSI4_t PSI4; - PSI13_t PSI13; PSI5_t PSI5; + Packet_Access_Reject_t Packet_Access_Reject; + Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; + Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; + Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; + Packet_Cell_Change_Order_t Packet_Cell_Change_Order; + Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; + Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; + Packet_Downlink_Assignment_t Packet_Downlink_Assignment; + Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; + Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; + Packet_Handover_Command_t Packet_Handover_Command; + Packet_Measurement_Order_t Packet_Measurement_Order; + Packet_Measurement_Report_t Packet_Measurement_Report; + Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; + Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; + Packet_PDCH_Release_t Packet_PDCH_Release; + Packet_PRACH_Parameters_t Packet_PRACH_Parameters; + Packet_PSI_Status_t Packet_PSI_Status; + Packet_Paging_Request_t Packet_Paging_Request; + Packet_Pause_t Packet_Pause; + Packet_PhysicalInformation_t Packet_PhysicalInformation; + Packet_Polling_Request_t Packet_Polling_Request; + Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; + Packet_Queueing_Notification_t Packet_Queueing_Notification; + Packet_Resource_Request_t Packet_Resource_Request; + Packet_SI_Status_t Packet_SI_Status; + Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; + Packet_TBF_Release_t Packet_TBF_Release; + Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; + Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; + Packet_Uplink_Assignment_t Packet_Uplink_Assignment; + Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; } u; /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a Gerrit-Change-Number: 17042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:24 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17043 ) Change subject: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure ...................................................................... gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function). Port from wireshark.git commit 9f8b638cfa8a660fb64c54dcadb83e6747db0a15. Ported-by: Pau Espin Pedrol Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 --- M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp 2 files changed, 25 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/17043/1 diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 196ced2..90c5bfd 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -4528,13 +4528,6 @@ PMO_AdditionsR98_t AdditionsR98; } Packet_Measurement_Order_t; -typedef struct -{ - guint8 MESSAGE_TYPE; - guint8 PAGE_MODE; - PacketDownlinkID_t ID; -} Packet_Measurement_Order_Reduced_t; - /* Enhanced measurement report */ typedef struct @@ -4900,45 +4893,32 @@ union { guint8 MESSAGE_TYPE; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - EGPRS_PD_AckNack_t EGPRS_PD_AckNack; - PSI13_t PSI13; + Packet_Access_Reject_t Packet_Access_Reject; + Packet_Cell_Change_Order_t Packet_Cell_Change_Order; + Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; + Packet_Downlink_Assignment_t Packet_Downlink_Assignment; + Packet_Measurement_Order_t Packet_Measurement_Order; + Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; + Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; + Packet_Paging_Request_t Packet_Paging_Request; + Packet_PDCH_Release_t Packet_PDCH_Release; + Packet_Polling_Request_t Packet_Polling_Request; + Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; + Packet_PRACH_Parameters_t Packet_PRACH_Parameters; + Packet_Queueing_Notification_t Packet_Queueing_Notification; + Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; + Packet_TBF_Release_t Packet_TBF_Release; + Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; + Packet_Uplink_Assignment_t Packet_Uplink_Assignment; + Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + Packet_Handover_Command_t Packet_Handover_Command; + Packet_PhysicalInformation_t Packet_PhysicalInformation; + Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; PSI1_t PSI1; PSI2_t PSI2; PSI3_t PSI3; PSI5_t PSI5; - Packet_Access_Reject_t Packet_Access_Reject; - Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; - Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; - Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; - Packet_Cell_Change_Order_t Packet_Cell_Change_Order; - Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; - Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - Packet_Downlink_Assignment_t Packet_Downlink_Assignment; - Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; - Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; - Packet_Handover_Command_t Packet_Handover_Command; - Packet_Measurement_Order_t Packet_Measurement_Order; - Packet_Measurement_Report_t Packet_Measurement_Report; - Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; - Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; - Packet_PDCH_Release_t Packet_PDCH_Release; - Packet_PRACH_Parameters_t Packet_PRACH_Parameters; - Packet_PSI_Status_t Packet_PSI_Status; - Packet_Paging_Request_t Packet_Paging_Request; - Packet_Pause_t Packet_Pause; - Packet_PhysicalInformation_t Packet_PhysicalInformation; - Packet_Polling_Request_t Packet_Polling_Request; - Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; - Packet_Queueing_Notification_t Packet_Queueing_Notification; - Packet_Resource_Request_t Packet_Resource_Request; - Packet_SI_Status_t Packet_SI_Status; - Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; - Packet_TBF_Release_t Packet_TBF_Release; - Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; - Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; - Packet_Uplink_Assignment_t Packet_Uplink_Assignment; - Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + PSI13_t PSI13; } u; /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members @@ -4974,17 +4954,17 @@ Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; Packet_Measurement_Report_t Packet_Measurement_Report; Packet_Resource_Request_t Packet_Resource_Request; Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; Packet_PSI_Status_t Packet_PSI_Status; + EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; + Packet_Pause_t Packet_Pause; Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; Packet_SI_Status_t Packet_SI_Status; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - Packet_Pause_t Packet_Pause; } u; gint16 NrOfBits; } RlcMacUplink_t; diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index b51d735..f911b09 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -65,7 +65,6 @@ cout << "sizeof Packet_Access_Reject_t " << sizeof(Packet_Access_Reject_t) << endl; cout << "sizeof Packet_Cell_Change_Order_t " << sizeof(Packet_Cell_Change_Order_t) << endl; cout << "sizeof Packet_Downlink_Assignment_t " << sizeof(Packet_Downlink_Assignment_t) << endl; - cout << "sizeof Packet_Measurement_Order_Reduced_t " << sizeof(Packet_Measurement_Order_Reduced_t) << endl; cout << "sizeof Packet_Neighbour_Cell_Data_t " << sizeof(Packet_Neighbour_Cell_Data_t) << endl; cout << "sizeof Packet_Serving_Cell_Data_t " << sizeof(Packet_Serving_Cell_Data_t) << endl; cout << "sizeof Packet_Paging_Request_t " << sizeof(Packet_Paging_Request_t) << endl; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 Gerrit-Change-Number: 17043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:25 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: Enhance dissection of PSI1 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17044 ) Change subject: gsm_rlcmac: Enhance dissection of PSI1 ...................................................................... gsm_rlcmac: Enhance dissection of PSI1 Port of wireshark.git 7e9411fee3a101b53693210f7a38789fd4c70ba2. Ported-by: Pau Espin Pedrol Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 39 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/44/17044/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ed7c745..5889471 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -576,8 +576,8 @@ static const CSN_DESCR_BEGIN(GPRS_Cell_Options_t) M_UINT (GPRS_Cell_Options_t, NMO, 2), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3168, 3, 1), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3192, 3, 1), + M_UINT (GPRS_Cell_Options_t, T3168, 3), + M_UINT (GPRS_Cell_Options_t, T3192, 3), M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3), M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE), M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE), @@ -4167,12 +4167,18 @@ /*< Packet System Information Type 1 message content >*/ +CSN_DESCR_BEGIN(PSI1_AdditionsR6_t) + M_UINT (PSI1_AdditionsR6_t, LB_MS_TXPWR_MAX_CCH, 5), +CSN_DESCR_END (PSI1_AdditionsR6_t) + static const -CSN_DESCR_BEGIN(PSI1_AdditionsR99_t) - M_UINT (PSI1_AdditionsR99_t, MSCR, 1), - M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), - M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), -CSN_DESCR_END (PSI1_AdditionsR99_t) +CSN_DESCR_BEGIN (PSI1_AdditionsR99_t) + M_UINT (PSI1_AdditionsR99_t, MSCR, 1), + M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), + M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), + M_NEXT_EXIST_OR_NULL (PSI1_AdditionsR99_t, Exist_AdditionsR6, 1), + M_TYPE (PSI1_AdditionsR99_t, AdditionsR6, PSI1_AdditionsR6_t), +CSN_DESCR_END (PSI1_AdditionsR99_t) static const CSN_DESCR_BEGIN(PCCCH_Organization_t) @@ -4185,26 +4191,26 @@ static const CSN_DESCR_BEGIN(PSI1_t) - M_UINT (PSI1_t, MESSAGE_TYPE, 6), - M_UINT (PSI1_t, PAGE_MODE, 2), + M_UINT (PSI1_t, MESSAGE_TYPE, 6), + M_UINT (PSI1_t, PAGE_MODE, 2), - M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), - M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), - M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), - M_UINT (PSI1_t, PSI_COUNT_LR, 6), + M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), + M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), + M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), + M_UINT (PSI1_t, PSI_COUNT_LR, 6), - M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), - M_UINT (PSI1_t, PSI_COUNT_HR, 4), + M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), + M_UINT (PSI1_t, PSI_COUNT_HR, 4), - M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), - M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), - M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), - M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), - M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), - M_UINT (PSI1_t, PSI_STATUS_IND, 1), + M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), + M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), + M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), + M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), + M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), + M_UINT (PSI1_t, PSI_STATUS_IND, 1), - M_NEXT_EXIST (PSI1_t, Exist_AdditionsR99, 1), - M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), + M_NEXT_EXIST_OR_NULL (PSI1_t, Exist_AdditionsR99, 1), + M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), M_PADDING_BITS(PSI1_t), CSN_DESCR_END (PSI1_t) diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 90c5bfd..b05483c 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -2492,9 +2492,16 @@ typedef struct { - guint8 MSCR; - guint8 SGSNR; - guint8 BandIndicator; + guint8 LB_MS_TXPWR_MAX_CCH; +} PSI1_AdditionsR6_t; + +typedef struct +{ + guint8 MSCR; + guint8 SGSNR; + guint8 BandIndicator; + gboolean Exist_AdditionsR6; + PSI1_AdditionsR6_t AdditionsR6; } PSI1_AdditionsR99_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 Gerrit-Change-Number: 17044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:25 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17045 ) Change subject: gsm_rlcmac.cpp: Fix trailing whitespace ...................................................................... gsm_rlcmac.cpp: Fix trailing whitespace Change-Id: I3b50cf386d417ba73b97f48b3000f69d9a54c8c9 --- M src/gsm_rlcmac.cpp 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/45/17045/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 5889471..d9a11eb 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -4235,10 +4235,10 @@ static const CSN_DESCR_BEGIN(Non_GPRS_Cell_Options_t) M_BIT (Non_GPRS_Cell_Options_t, ATT), - + M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_T3212, 1), M_UINT (Non_GPRS_Cell_Options_t, T3212, 8), - + M_BIT (Non_GPRS_Cell_Options_t, NECI), M_BIT (Non_GPRS_Cell_Options_t, PWRC), M_UINT (Non_GPRS_Cell_Options_t, DTX, 2), @@ -4343,7 +4343,7 @@ M_BIT (Gen_Cell_Sel_t, C31_HYST), M_BIT (Gen_Cell_Sel_t, C32_QUAL), M_FIXED (Gen_Cell_Sel_t, 1, 0x01), - + M_NEXT_EXIST (Gen_Cell_Sel_t, Exist_T_RESEL, 1), M_UINT (Gen_Cell_Sel_t, T_RESEL, 3), @@ -4440,7 +4440,7 @@ M_TYPE (PSI3_t, Serving_Cell_params, Serving_Cell_params_t), M_TYPE (PSI3_t, General_Cell_Selection, Gen_Cell_Sel_t), M_TYPE (PSI3_t, NeighbourCellList, NeighbourCellList_t), - + M_NEXT_EXIST (PSI3_t, Exist_AdditionR98, 1), M_TYPE (PSI3_t, AdditionR98, PSI3_AdditionR98_t), @@ -4482,14 +4482,14 @@ M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existRepParamsFDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, RepQuantFDD, 1), M_UINT (GPRSMeasurementParams3G_PSI5_t, MultiratReportingFDD, 2), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existReportingParamsFDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingOffsetFDD, 3), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingThresholdFDD, 3), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existMultiratReportingTDD, 1), M_UINT (GPRSMeasurementParams3G_PSI5_t, MultiratReportingTDD, 2), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existOffsetThresholdTDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingOffsetTDD, 3), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingThresholdTDD, 3), @@ -4503,10 +4503,10 @@ M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_NCC_PERMITTED, 1), M_UINT (ENH_Reporting_Parameters_t, NCC_PERMITTED, 8), - + M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_GPRSMeasurementParams, 1), M_TYPE (ENH_Reporting_Parameters_t, GPRSMeasurementParams, MeasurementParams_t), - + M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_GPRSMeasurementParams3G, 1), M_TYPE (ENH_Reporting_Parameters_t, GPRSMeasurementParams3G, GPRSMeasurementParams3G_PSI5_t), CSN_DESCR_END (ENH_Reporting_Parameters_t) @@ -4524,7 +4524,7 @@ CSN_DESCR_BEGIN(PSI5_AdditionsR5) M_NEXT_EXIST (PSI5_AdditionsR5, Exist_GPRS_AdditionalMeasurementParams3G, 1), M_TYPE (PSI5_AdditionsR5, GPRS_AdditionalMeasurementParams3G, GPRS_AdditionalMeasurementParams3G_t), - + M_NEXT_EXIST (PSI5_AdditionsR5, Exist_AdditionsR7, 1), M_TYPE (PSI5_AdditionsR5, AdditionsR7, PSI5_AdditionsR7), CSN_DESCR_END (PSI5_AdditionsR5) @@ -4587,7 +4587,7 @@ M_UINT (PSI13_t, PAGE_MODE, 2), M_UINT (PSI13_t, BCCH_CHANGE_MARK, 3), M_UINT (PSI13_t, SI_CHANGE_FIELD, 4), - + M_NEXT_EXIST (PSI13_t, Exist_MA, 2), M_UINT (PSI13_t, SI13_CHANGE_MARK, 2), M_TYPE (PSI13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), @@ -5473,7 +5473,7 @@ LOGPC(DRLCMACDATA, LOGL_NOTICE, "RRBP = %u ", (unsigned)(data->RRBP)); LOGPC(DRLCMACDATA, LOGL_NOTICE, "SP = %u ", (unsigned)(data->SP)); LOGPC(DRLCMACDATA, LOGL_NOTICE, "USF = %u ", (unsigned)(data->USF)); - + // Octet 1 bitvec_write_field(vector, &writeIndex, data->PR, 2); bitvec_write_field(vector, &writeIndex, data->TFI, 5); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3b50cf386d417ba73b97f48b3000f69d9a54c8c9 Gerrit-Change-Number: 17045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:25 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17046 ) Change subject: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. ...................................................................... gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. Port from wireshark.git e97273a35d101516decbc7d98fcc6c6b3f193962. Ported-by: Pau Espin Pedrol Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea --- M src/gsm_rlcmac.cpp 1 file changed, 61 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/17046/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index d9a11eb..c12c3e5 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -104,7 +104,7 @@ M_UINT (GPRS_Power_Control_Parameters_t, ALPHA, 4), M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_W, 5), M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_T, 5), - M_BIT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN), + M_UINT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN, 1), M_UINT (GPRS_Power_Control_Parameters_t, N_AVG_I, 4), CSN_DESCR_END (GPRS_Power_Control_Parameters_t) @@ -258,8 +258,8 @@ static const CSN_DESCR_BEGIN(Group_Call_Reference_t) M_UINT (Group_Call_Reference_t, value, 27), - M_BIT (Group_Call_Reference_t, SF), - M_BIT (Group_Call_Reference_t, AF), + M_UINT (Group_Call_Reference_t, SF, 1), + M_UINT (Group_Call_Reference_t, AF, 1), M_UINT (Group_Call_Reference_t, call_priority, 3), M_UINT (Group_Call_Reference_t, Ciphering_information, 4), CSN_DESCR_END (Group_Call_Reference_t) @@ -542,7 +542,7 @@ M_UINT (Packet_Polling_Request_t, MESSAGE_TYPE, 6), M_UINT (Packet_Polling_Request_t, PAGE_MODE, 2), M_TYPE (Packet_Polling_Request_t, ID, PacketPollingID_t), - M_BIT (Packet_Polling_Request_t, TYPE_OF_ACK), + M_UINT (Packet_Polling_Request_t, TYPE_OF_ACK, 1), M_PADDING_BITS(Packet_Polling_Request_t), CSN_DESCR_END (Packet_Polling_Request_t) @@ -579,8 +579,8 @@ M_UINT (GPRS_Cell_Options_t, T3168, 3), M_UINT (GPRS_Cell_Options_t, T3192, 3), M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3), - M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE), - M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE), + M_UINT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE, 1), + M_UINT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE, 1), M_UINT (GPRS_Cell_Options_t, BS_CV_MAX, 4), M_NEXT_EXIST (GPRS_Cell_Options_t, Exist_PAN, 3), @@ -595,7 +595,7 @@ static const CSN_DESCR_BEGIN(PBCCH_Not_present_t) M_UINT (PBCCH_Not_present_t, RAC, 8), - M_BIT (PBCCH_Not_present_t, SPGC_CCCH_SUP), + M_UINT (PBCCH_Not_present_t, SPGC_CCCH_SUP, 1), M_UINT (PBCCH_Not_present_t, PRIORITY_ACCESS_THR, 3), M_UINT (PBCCH_Not_present_t, NETWORK_CONTROL_ORDER, 2), M_TYPE (PBCCH_Not_present_t, GPRS_Cell_Options, GPRS_Cell_Options_t), @@ -676,8 +676,8 @@ M_UINT (Packet_TBF_Release_t, PAGE_MODE, 2), M_FIXED (Packet_TBF_Release_t, 1, 0x00), M_TYPE (Packet_TBF_Release_t, Global_TFI, Global_TFI_t), - M_BIT (Packet_TBF_Release_t, UPLINK_RELEASE), - M_BIT (Packet_TBF_Release_t, DOWNLINK_RELEASE), + M_UINT (Packet_TBF_Release_t, UPLINK_RELEASE, 1), + M_UINT (Packet_TBF_Release_t, DOWNLINK_RELEASE, 1), M_UINT (Packet_TBF_Release_t, TBF_RELEASE_CAUSE, 4), M_PADDING_BITS(Packet_TBF_Release_t ), CSN_DESCR_END (Packet_TBF_Release_t) @@ -1044,8 +1044,8 @@ CSN_DESCR_BEGIN(Channel_Request_Description_t) M_UINT (Channel_Request_Description_t, PEAK_THROUGHPUT_CLASS, 4), M_UINT (Channel_Request_Description_t, RADIO_PRIORITY, 2), - M_BIT (Channel_Request_Description_t, RLC_MODE), - M_BIT (Channel_Request_Description_t, LLC_PDU_TYPE), + M_UINT (Channel_Request_Description_t, RLC_MODE, 1), + M_UINT (Channel_Request_Description_t, LLC_PDU_TYPE, 1), M_UINT (Channel_Request_Description_t, RLC_OCTET_COUNT, 16), CSN_DESCR_END (Channel_Request_Description_t) @@ -1752,7 +1752,7 @@ static const CSN_DESCR_BEGIN (PUA_GPRS_t) M_UINT (PUA_GPRS_t, CHANNEL_CODING_COMMAND, 2), - M_BIT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING), + M_UINT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING, 1), M_TYPE (PUA_GPRS_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (PUA_GPRS_t, Exist_Frequency_Parameters, 1), @@ -1903,14 +1903,14 @@ M_FIXED (Packet_Downlink_Assignment_t, 1, 0x00),/*-- Message escape */ M_UINT (Packet_Downlink_Assignment_t, MAC_MODE, 2), - M_BIT (Packet_Downlink_Assignment_t, RLC_MODE), - M_BIT (Packet_Downlink_Assignment_t, CONTROL_ACK), + M_UINT (Packet_Downlink_Assignment_t, RLC_MODE, 1), + M_UINT (Packet_Downlink_Assignment_t, CONTROL_ACK, 1), M_UINT (Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8), M_TYPE (Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3), M_UINT (Packet_Downlink_Assignment_t, P0, 4), - M_BIT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE), + M_UINT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1), M_UINT (Packet_Downlink_Assignment_t, PR_MODE, 1), M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_Frequency_Parameters, 1), @@ -1951,7 +1951,7 @@ static const CSN_DESCR_BEGIN(DTM_Packet_Uplink_Assignment_t) M_UINT (DTM_Packet_Uplink_Assignment_t, CHANNEL_CODING_COMMAND, 2), - M_BIT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING), + M_UINT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING, 1), M_TYPE (DTM_Packet_Uplink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_UNION (DTM_Packet_Uplink_Assignment_t, 3), @@ -1975,13 +1975,13 @@ static const CSN_DESCR_BEGIN(DTM_Packet_Downlink_Assignment_t) M_UINT (DTM_Packet_Downlink_Assignment_t, MAC_MODE, 2), - M_BIT (DTM_Packet_Downlink_Assignment_t, RLC_MODE), + M_UINT (DTM_Packet_Downlink_Assignment_t, RLC_MODE ,1), M_UINT (DTM_Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8), M_TYPE (DTM_Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3), M_UINT (DTM_Packet_Downlink_Assignment_t, P0, 4), - M_BIT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE), + M_UINT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1), M_UINT (DTM_Packet_Downlink_Assignment_t, PR_MODE, 1), M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_Power_Control_Parameters, 1), @@ -2876,7 +2876,7 @@ static const CSN_DESCR_BEGIN(GPRS_EUTRAN_MeasurementParametersDescription_t) M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, Qsearch_P_EUTRAN, 4), - M_BIT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT), + M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT, 1), M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_MULTIRAT_REPORTING, 2), M_TYPE (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REPORTING_THRESHOLD_OFFSET, EUTRAN_REPORTING_THRESHOLD_OFFSET_t), CSN_DESCR_END (GPRS_EUTRAN_MeasurementParametersDescription_t) @@ -2942,7 +2942,7 @@ static const CSN_DESCR_BEGIN(EUTRAN_ParametersDescription_PMO_t) - M_BIT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE), + M_UINT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE, 1), M_NEXT_EXIST (EUTRAN_ParametersDescription_PMO_t, existGPRS_EUTRAN_MeasurementParametersDescription, 1), M_TYPE (EUTRAN_ParametersDescription_PMO_t, GPRS_EUTRAN_MeasurementParametersDescription, GPRS_EUTRAN_MeasurementParametersDescription_t), @@ -2956,7 +2956,7 @@ CSN_DESCR_BEGIN(PSC_Pattern_t) M_UINT (PSC_Pattern_t, PSC_Pattern_length, 3), M_VAR_BITMAP (PSC_Pattern_t, PSC_Pattern, PSC_Pattern_length, 1), - M_BIT (PSC_Pattern_t, PSC_Pattern_sense), + M_UINT (PSC_Pattern_t, PSC_Pattern_sense, 1), CSN_DESCR_END (PSC_Pattern_t) static const @@ -2990,13 +2990,13 @@ static const CSN_DESCR_BEGIN(Meas_Ctrl_Param_Desp_t) M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_EUTRAN, 3), - M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN), - M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3), + M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN, 1), + M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3), M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX, Count_EUTRAN_FREQUENCY_INDEX, 3), M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_UTRAN, 1), - M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN), - M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5), - M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5), + M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN, 1), + M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5), + M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5), CSN_DESCR_END (Meas_Ctrl_Param_Desp_t) static const @@ -3134,8 +3134,8 @@ static const CSN_DESCR_BEGIN (PMO_AdditionsR8_t) M_NEXT_EXIST (PMO_AdditionsR8_t, existBA_IND_3G_PMO_IND, 2), - M_BIT (PMO_AdditionsR8_t, BA_IND_3G), - M_BIT (PMO_AdditionsR8_t, PMO_IND), + M_UINT (PMO_AdditionsR8_t, BA_IND_3G, 1), + M_UINT (PMO_AdditionsR8_t, PMO_IND, 1), M_NEXT_EXIST (PMO_AdditionsR8_t, existPriorityAndEUTRAN_ParametersDescription_PMO, 1), M_TYPE (PMO_AdditionsR8_t, PriorityAndEUTRAN_ParametersDescription_PMO, PriorityAndEUTRAN_ParametersDescription_PMO_t), M_NEXT_EXIST (PMO_AdditionsR8_t, existIndividualPriorities_PMO, 1), @@ -3447,19 +3447,19 @@ M_NEXT_EXIST (UTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1), M_TYPE (UTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t), M_UINT (UTRAN_CSG_Measurement_Report_t, CSG_ID, 27), - M_BIT (UTRAN_CSG_Measurement_Report_t, Access_Mode), + M_UINT (UTRAN_CSG_Measurement_Report_t, Access_Mode, 1), M_UINT (UTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), CSN_DESCR_END (UTRAN_CSG_Measurement_Report_t) static const CSN_DESCR_BEGIN(EUTRAN_CSG_Measurement_Report_t) - M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28), - M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16), + M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28), + M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16), M_NEXT_EXIST (EUTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1), M_TYPE (EUTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t), - M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27), - M_BIT (EUTRAN_CSG_Measurement_Report_t, Access_Mode), - M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), + M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27), + M_UINT (EUTRAN_CSG_Measurement_Report_t, Access_Mode, 1), + M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), CSN_DESCR_END (EUTRAN_CSG_Measurement_Report_t) static const @@ -3505,7 +3505,7 @@ static const CSN_DESCR_BEGIN(EMR_ServingCell_t) /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/ - M_BIT (EMR_ServingCell_t, DTX_USED), + M_UINT (EMR_ServingCell_t, DTX_USED, 1), M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6), M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3), M_UINT (EMR_ServingCell_t, MEAN_BEP, 5), @@ -3699,7 +3699,7 @@ static const CSN_DESCR_BEGIN(Eutran_Ccn_Measurement_Report_t) - M_BIT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED), + M_UINT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED, 1), M_UINT_OFFSET(Eutran_Ccn_Measurement_Report_t, N_EUTRAN, 2, 1), M_VAR_TARRAY (Eutran_Ccn_Measurement_Report_t, Eutran_Ccn_Measurement_Report_Cell, Eutran_Ccn_Measurement_Report_Cell_t, N_EUTRAN), CSN_DESCR_END (Eutran_Ccn_Measurement_Report_t) @@ -3881,12 +3881,12 @@ static const CSN_DESCR_BEGIN (NC_MeasurementReport_t) - M_BIT (NC_MeasurementReport_t, NC_MODE), + M_UINT (NC_MeasurementReport_t, NC_MODE, 1), M_UNION (NC_MeasurementReport_t, 2), M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t), - M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), - M_BIT (NC_MeasurementReport_t, PMO_USED), - M_BIT (NC_MeasurementReport_t, SCALE), + M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), + M_UINT (NC_MeasurementReport_t, PMO_USED, 1), + M_UINT (NC_MeasurementReport_t, SCALE, 1), M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1), M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t), @@ -3911,9 +3911,9 @@ CSN_DESCR_BEGIN (PHO_DownlinkAssignment_t) M_UINT (PHO_DownlinkAssignment_t, TimeslotAllocation, 8), M_UINT (PHO_DownlinkAssignment_t, PFI, 7), - M_BIT (PHO_DownlinkAssignment_t, RLC_Mode), + M_UINT (PHO_DownlinkAssignment_t, RLC_Mode, 1), M_UINT (PHO_DownlinkAssignment_t, TFI_Assignment, 5), - M_BIT (PHO_DownlinkAssignment_t, ControlACK), + M_UINT (PHO_DownlinkAssignment_t, ControlACK, 1), M_NEXT_EXIST (PHO_DownlinkAssignment_t, Exist_EGPRS_WindowSize, 1), M_UINT (PHO_DownlinkAssignment_t, EGPRS_WindowSize, 5), @@ -3934,7 +3934,7 @@ static const CSN_DESCR_BEGIN (PHO_UplinkAssignment_t) M_UINT (PHO_UplinkAssignment_t, PFI, 7), - M_BIT (PHO_UplinkAssignment_t, RLC_Mode), + M_UINT (PHO_UplinkAssignment_t, RLC_Mode, 1), M_UINT (PHO_UplinkAssignment_t, TFI_Assignment, 5), M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_ChannelCodingCommand, 1), @@ -3946,7 +3946,7 @@ M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_EGPRS_WindowSize, 1), M_UINT (PHO_UplinkAssignment_t, EGPRS_WindowSize, 5), - M_BIT (PHO_UplinkAssignment_t, USF_Granularity), + M_UINT (PHO_UplinkAssignment_t, USF_Granularity, 1), M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_TBF_TimeslotAllocation, 1), M_LEFT_VAR_BMP (PHO_UplinkAssignment_t, TBF_TimeslotAllocation, u.USF_AllocationArray.NBR_OfAllocatedTimeslots, 0), @@ -4043,13 +4043,13 @@ M_UINT (PHO_RadioResources_t, ARFCN, 10), M_UINT (PHO_RadioResources_t, SI, 2), - M_BIT (PHO_RadioResources_t, NCI), + M_UINT (PHO_RadioResources_t, NCI, 1), M_UINT (PHO_RadioResources_t, BSIC, 6), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active, 1), - M_BIT (PHO_RadioResources_t, CCN_Active), + M_UINT (PHO_RadioResources_t, CCN_Active, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active_3G, 1), - M_BIT (PHO_RadioResources_t, CCN_Active_3G), + M_UINT (PHO_RadioResources_t, CCN_Active_3G, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Support_Description, 1), M_TYPE (PHO_RadioResources_t, CCN_Support_Description, CCN_Support_Description_t), @@ -4059,11 +4059,11 @@ M_NEXT_EXIST (PHO_RadioResources_t, Exist_PHO_TimingAdvance, 1), M_TYPE (PHO_RadioResources_t, PHO_TimingAdvance, PHO_TimingAdvance_t), - M_BIT (PHO_RadioResources_t, Extended_Dynamic_Allocation), - M_BIT (PHO_RadioResources_t, RLC_Reset), + M_UINT (PHO_RadioResources_t, Extended_Dynamic_Allocation, 1), + M_UINT (PHO_RadioResources_t, RLC_Reset, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_PO_PR, 2), M_UINT (PHO_RadioResources_t, PO, 4), - M_BIT (PHO_RadioResources_t, PR_Mode), + M_UINT (PHO_RadioResources_t, PR_Mode, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_UplinkControlTimeslot, 1), @@ -4234,13 +4234,13 @@ static const CSN_DESCR_BEGIN(Non_GPRS_Cell_Options_t) - M_BIT (Non_GPRS_Cell_Options_t, ATT), + M_UINT (Non_GPRS_Cell_Options_t, ATT, 1), M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_T3212, 1), M_UINT (Non_GPRS_Cell_Options_t, T3212, 8), - M_BIT (Non_GPRS_Cell_Options_t, NECI), - M_BIT (Non_GPRS_Cell_Options_t, PWRC), + M_UINT (Non_GPRS_Cell_Options_t, NECI, 1), + M_UINT (Non_GPRS_Cell_Options_t, PWRC, 1), M_UINT (Non_GPRS_Cell_Options_t, DTX, 2), M_UINT (Non_GPRS_Cell_Options_t, RADIO_LINK_TIMEOUT, 4), M_UINT (Non_GPRS_Cell_Options_t, BS_AG_BLKS_RES, 3), @@ -4248,7 +4248,7 @@ M_UINT (Non_GPRS_Cell_Options_t, BS_PA_MFRMS, 3), M_UINT (Non_GPRS_Cell_Options_t, MAX_RETRANS, 2), M_UINT (Non_GPRS_Cell_Options_t, TX_INTEGER, 4), - M_BIT (Non_GPRS_Cell_Options_t, EC), + M_UINT (Non_GPRS_Cell_Options_t, EC, 1), M_UINT (Non_GPRS_Cell_Options_t, MS_TXPWR_MAX_CCCH, 5), M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_Extension_Bits, 1), @@ -4327,8 +4327,8 @@ /*< Packet System Information Type 3 message content >*/ static const CSN_DESCR_BEGIN(Serving_Cell_params_t) - M_BIT (Serving_Cell_params_t, CELL_BAR_ACCESS_2), - M_BIT (Serving_Cell_params_t, EXC_ACC), + M_UINT (Serving_Cell_params_t, CELL_BAR_ACCESS_2, 1), + M_UINT (Serving_Cell_params_t, EXC_ACC, 1), M_UINT (Serving_Cell_params_t, GPRS_RXLEV_ACCESS_MIN, 6), M_UINT (Serving_Cell_params_t, GPRS_MS_TXPWR_MAX_CCH, 5), M_NEXT_EXIST (Serving_Cell_params_t, Exist_HCS, 1), @@ -4340,8 +4340,8 @@ static const CSN_DESCR_BEGIN(Gen_Cell_Sel_t) M_UINT (Gen_Cell_Sel_t, GPRS_CELL_RESELECT_HYSTERESIS, 3), - M_BIT (Gen_Cell_Sel_t, C31_HYST), - M_BIT (Gen_Cell_Sel_t, C32_QUAL), + M_UINT (Gen_Cell_Sel_t, C31_HYST, 1), + M_UINT (Gen_Cell_Sel_t, C32_QUAL, 1), M_FIXED (Gen_Cell_Sel_t, 1, 0x01), M_NEXT_EXIST (Gen_Cell_Sel_t, Exist_T_RESEL, 1), @@ -4355,9 +4355,9 @@ static const CSN_DESCR_BEGIN(COMPACT_Cell_Sel_t) M_UINT (COMPACT_Cell_Sel_t, bsic, 6), - M_BIT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2), - M_BIT (COMPACT_Cell_Sel_t, EXC_ACC), - M_BIT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL), + M_UINT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2, 1), + M_UINT (COMPACT_Cell_Sel_t, EXC_ACC, 1), + M_UINT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL, 1), M_NEXT_EXIST (COMPACT_Cell_Sel_t, Exist_GPRS_RXLEV_ACCESS_MIN, 2), M_UINT (COMPACT_Cell_Sel_t, GPRS_RXLEV_ACCESS_MIN, 6), M_UINT (COMPACT_Cell_Sel_t, GPRS_MS_TXPWR_MAX_CCH, 5), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea Gerrit-Change-Number: 17046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:25 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17047 ) Change subject: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing ...................................................................... gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing Port from wireshark.git c4ead251da7199cfd746d378c51eb8c30d09a6ba. Ported-by: Pau Espin Pedrol Change-Id: Ib9b8eafd69d3b45b0d631ba9635689807b472b73 --- M src/gsm_rlcmac.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/17047/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c12c3e5..7006900 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -3959,7 +3959,7 @@ static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_UA_t) M_TYPE (GlobalTimeslotDescription_UA_t, GlobalTimeslotDescription, GlobalTimeslotDescription_t), - M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 3), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 2), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ M_TYPE (GlobalTimeslotDescription_UA_t, PHO_UA, PHO_UplinkAssignment_t), M_FIXED (GlobalTimeslotDescription_UA_t, 1, 0x0), /* Escape recursive */ @@ -4012,7 +4012,7 @@ M_NEXT_EXIST (PHO_EGPRS_t, Exist_GlobalTimeslotDescription_UA, 1), M_TYPE (PHO_EGPRS_t, GTD_UA, GlobalTimeslotDescription_UA_t), - M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 2), + M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 1), M_TYPE (PHO_EGPRS_t, DownlinkTBF, DownlinkTBF_t), CSN_DESCR_END (PHO_EGPRS_t) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib9b8eafd69d3b45b0d631ba9635689807b472b73 Gerrit-Change-Number: 17047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:26 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix an out of bounds access References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17048 ) Change subject: gsm_rlcmac.cpp: fix an out of bounds access ...................................................................... gsm_rlcmac.cpp: fix an out of bounds access Port from wireshark.git a4a5adb68b898f770e2addf9168d796979ebe237. Ported-by: Pau Espin Pedrol Change-Id: I23fb2199fc8f9cc3e5bd475e2558ee8d482df1e1 --- M src/gsm_rlcmac.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/17048/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 7006900..39f328d 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -3480,7 +3480,7 @@ static const CSN_DESCR_BEGIN (PMR_AdditionsR5_t) - M_NEXT_EXIST (PMR_AdditionsR5_t, Exist_GRNTI, 4), + M_NEXT_EXIST (PMR_AdditionsR5_t, Exist_GRNTI, 3), M_UINT (PMR_AdditionsR5_t, GRNTI, 4), M_NEXT_EXIST_OR_NULL (PMR_AdditionsR5_t, Exist_AdditionsR8, 1), M_TYPE (PMR_AdditionsR5_t, AdditionsR8, PMR_AdditionsR8_t), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I23fb2199fc8f9cc3e5bd475e2558ee8d482df1e1 Gerrit-Change-Number: 17048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:26 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: add dissection of NAS container References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17049 ) Change subject: gsm_rlcmac: add dissection of NAS container ...................................................................... gsm_rlcmac: add dissection of NAS container Port from wireshark.git 575e4df4aa3392ffd09ca372859573f09f0a5c57 Ported-by: Pau Espin Pedrol Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 20 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/17049/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 39f328d..4550c47 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -4024,10 +4024,16 @@ CSN_DESCR_END (PHO_TimingAdvance_t) static const -CSN_DESCR_BEGIN(NAS_Container_t) - M_UINT (NAS_Container_t, NAS_ContainerLength, 7), - M_VAR_ARRAY (NAS_Container_t, NAS_Container, NAS_ContainerLength, 0), -CSN_DESCR_END (NAS_Container_t) +CSN_DESCR_BEGIN(NAS_Container_For_PS_HO_t) + M_UINT (NAS_Container_For_PS_HO_t, NAS_ContainerLength, 7), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1a, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1b, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1c, 1), + M_UINT (NAS_Container_For_PS_HO_t, Old_XID, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1e, 1), + M_UINT (NAS_Container_For_PS_HO_t, Type_of_Ciphering_Algo, 3), + M_UINT (NAS_Container_For_PS_HO_t, IOV_UI_value, 32), +CSN_DESCR_END (NAS_Container_For_PS_HO_t) static const CSN_DESCR_BEGIN(PS_HandoverTo_UTRAN_Payload_t) @@ -4080,7 +4086,7 @@ M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, PHO_RadioResources, PHO_RadioResources_t), M_NEXT_EXIST (PS_HandoverTo_A_GB_ModePayload_t, Exist_NAS_Container, 1), - M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_t), + M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_For_PS_HO_t), CSN_DESCR_END (PS_HandoverTo_A_GB_ModePayload_t) static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index b05483c..461fda3 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -415,7 +415,6 @@ #define MAX_ALLOCATION_BITMAP_LENGTH 128 /* max length of Fixed Allocation bitmap in BITS (2^7) */ #define MAX_VAR_LENGTH_BITMAP_LENGTH 176 /* max length ever possible for variable length fixed allocation bitmap */ #define MAX_RRC_CONTAINER_LENGTH 255 -#define MAX_NAS_CONTAINER_LENGTH 127 typedef struct @@ -4693,8 +4692,14 @@ typedef struct { guint8 NAS_ContainerLength; - guint8 NAS_Container[MAX_NAS_CONTAINER_LENGTH]; -} NAS_Container_t; + guint8 Spare_1a; + guint8 Spare_1b; + guint8 Spare_1c; + guint8 Old_XID; + guint8 Spare_1e; + guint8 Type_of_Ciphering_Algo; + guint32 IOV_UI_value; +} NAS_Container_For_PS_HO_t; typedef struct { @@ -4740,7 +4745,7 @@ { PHO_RadioResources_t PHO_RadioResources; guint8 Exist_NAS_Container; - NAS_Container_t NAS_Container; + NAS_Container_For_PS_HO_t NAS_Container; } PS_HandoverTo_A_GB_ModePayload_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36 Gerrit-Change-Number: 17049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:26 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: improve dissection of Packet Resource Request message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17050 ) Change subject: gsm_rlcmac: improve dissection of Packet Resource Request message ...................................................................... gsm_rlcmac: improve dissection of Packet Resource Request message Port from wireshark.git de028e81c53f9c45ccc5adb3bffd2f16ae2017bf This commit breaks a unit test. Ported-by: Pau Espin Pedrol Change-Id: Ibb4cbd3f5865415fd547e95fc24ff31df1aed4c0 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M src/pdch.cpp M tests/rlcmac/RLCMACTest.ok 4 files changed, 77 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/50/17050/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 4550c47..c12cf69 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -777,6 +777,12 @@ CSN_DESCR_END (DTM_EGPRS_HighMultislotClass_t) static const +CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t) + M_NEXT_EXIST (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 1), + M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 3), +CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t) + +static const CSN_DESCR_BEGIN (Multislot_capability_t) M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_HSCSD_multislot_class, 1), M_UINT (Multislot_capability_t, HSCSD_multislot_class, 5), @@ -854,6 +860,25 @@ M_TYPE (Content_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t), M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1), + + /* additions in release 7 */ + M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1), + M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1), + M_TYPE (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), + + M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1), + M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1), + M_UINT_OR_NULL (Content_t, RLC_Non_persistentMode, 1), + M_UINT_OR_NULL (Content_t, ReducedLatencyCapability, 1), + M_UINT_OR_NULL (Content_t, UplinkEGPRS2, 2), + M_UINT_OR_NULL (Content_t, DownlinkEGPRS2, 2), + + /* additions in release 8 */ + M_UINT_OR_NULL (Content_t, EUTRA_FDD_Support, 1), + M_UINT_OR_NULL (Content_t, EUTRA_TDD_Support, 1), + M_UINT_OR_NULL (Content_t, GERAN_To_EUTRAN_supportInGERAN_PTM, 2), + M_UINT_OR_NULL (Content_t, PriorityBasedReselectionSupport, 1), + CSN_DESCR_END (Content_t) gint16 Content_Dissector(csnStream_t* ar, bitvec *vector, unsigned& readIndex, void* data) @@ -897,9 +922,18 @@ { {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMR, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM450, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM480, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM750, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT830, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT410, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM710, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMT810, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ }; @@ -1138,7 +1172,7 @@ M_NEXT_EXIST (Packet_Resource_Request_t, Exist_SIGN_VAR, 1), M_UINT (Packet_Resource_Request_t, SIGN_VAR, 6), - M_TYPE_ARRAY (Packet_Resource_Request_t, Slot, InterferenceMeasurementReport_t, 8), + M_TYPE_ARRAY (Packet_Resource_Request_t, I_LEVEL_TN, InterferenceMeasurementReport_t, 8), M_NEXT_EXIST_OR_NULL(Packet_Resource_Request_t, Exist_AdditionsR99, 1), M_TYPE (Packet_Resource_Request_t, AdditionsR99, PRR_AdditionsR99_t), diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 461fda3..c1869ae 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -1109,6 +1109,12 @@ typedef struct { + guint8 MultislotCapabilityReductionForDL_DualCarrier; + guint8 DL_DualCarrierForDTM; +} DownlinkDualCarrierCapability_r7_t; + +typedef struct +{ guint8 Exist_HSCSD_multislot_class; guint8 HSCSD_multislot_class; @@ -1194,6 +1200,25 @@ guint8 DTM_GPRS_HighMultislotClass; DTM_EGPRS_HighMultislotClass_t DTM_EGPRS_HighMultislotClass; guint8 PS_HandoverCapability; + + /* -------- R7 additions */ + guint8 DTM_Handover_Capability; + guint8 Exist_DownlinkDualCarrierCapability_r7; + DownlinkDualCarrierCapability_r7_t DownlinkDualCarrierCapability_r7; + + guint8 FlexibleTimeslotAssignment; + guint8 GAN_PS_HandoverCapability; + guint8 RLC_Non_persistentMode; + guint8 ReducedLatencyCapability; + guint8 UplinkEGPRS2; + guint8 DownlinkEGPRS2; + + /* -------- R8 additions */ + guint8 EUTRA_FDD_Support; + guint8 EUTRA_TDD_Support; + guint8 GERAN_To_EUTRAN_supportInGERAN_PTM; + guint8 PriorityBasedReselectionSupport; + } Content_t; #define ABSOLUTE_MAX_BANDS 2 /* New fields for R4 extend the length of the capabilities message so we can only send 2 */ @@ -1201,12 +1226,21 @@ #define MAX_ACCESS_TECHNOLOGIES_COUNT 16 /* No more than 16 instances */ typedef enum -{/* See TS 24.008 table 10.5.146, GSM R and GSM 450/480 excluded */ +{/* See TS 24.008 table 10.5.146 */ AccTech_GSMP = 0x0, AccTech_GSME = 0x1, + AccTech_GSMR = 0x2, AccTech_GSM1800 = 0x3, AccTech_GSM1900 = 0x4, + AccTech_GSM450 = 0x5, + AccTech_GSM480 = 0x6, AccTech_GSM850 = 0x7, + AccTech_GSM750 = 0x8, + AccTech_GSMT830 = 0x9, + AccTech_GSMT410 = 0xa, + AccTech_GSMT900 = 0xb, + AccTech_GSM710 = 0xc, + AccTech_GSMT810 = 0xd, AccTech_GSMOther = 0xf } AccessTechnology_t; @@ -1459,7 +1493,7 @@ guint8 Exist_SIGN_VAR; guint8 SIGN_VAR; - InterferenceMeasurementReport_t Slot[8]; + InterferenceMeasurementReport_t I_LEVEL_TN[8]; guint8 Exist_AdditionsR99; PRR_AdditionsR99_t AdditionsR99; diff --git a/src/pdch.cpp b/src/pdch.cpp index e15af2c..6a35464 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -80,13 +80,13 @@ if (qr->Exist_SIGN_VAR) meas->set_ms_sign_var((qr->SIGN_VAR + 2) / 4); /* SIGN_VAR * 0.25 dB */ - for (i = 0; i < OSMO_MIN(ARRAY_SIZE(qr->Slot), ARRAY_SIZE(meas->ts)); i++) + for (i = 0; i < OSMO_MIN(ARRAY_SIZE(qr->I_LEVEL_TN), ARRAY_SIZE(meas->ts)); i++) { - if (qr->Slot[i].Exist) { + if (qr->I_LEVEL_TN[i].Exist) { LOGP(DRLCMAC, LOGL_INFO, "Packet resource request: i_level[%d] = %d\n", - i, qr->Slot[i].I_LEVEL); - meas->set_ms_i_level(i, -2 * qr->Slot[i].I_LEVEL); + i, qr->I_LEVEL_TN[i].I_LEVEL); + meas->set_ms_i_level(i, -2 * qr->I_LEVEL_TN[i].I_LEVEL); } } } diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 5793d57..7dd0a9c 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -104,8 +104,8 @@ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ vector1 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b -vector2 = 40 16 71 3d c0 94 27 0c a2 ae 57 ef 90 90 06 aa 0f c0 00 1f 80 22 2b -vector1 == vector2 : TRUE +vector2 = 40 16 71 3d c0 94 27 48 a2 ae 57 ef 90 90 06 aa 00 00 1f 80 00 3f 00 +vector1 == vector2 : FALSE vector1 = 40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibb4cbd3f5865415fd547e95fc24ff31df1aed4c0 Gerrit-Change-Number: 17050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:27 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17051 ) Change subject: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 ...................................................................... gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 Port from wireshark.git 07fc801684ebff7aff02505cdb2c120caea846e0. Ported-by: Pau Espin Pedrol Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 295 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/17051/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c12cf69..16a378d 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -1131,6 +1131,152 @@ CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_t) static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_t) + + M_UINT (IU_Mode_Channel_Request_Desk_t, RB_ID, 5), + M_UINT (IU_Mode_Channel_Request_Desk_t, RADIO_PRIORITY, 2), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_RLC_BLOCK_COUNT, 1), + M_UINT (IU_Mode_Channel_Request_Desk_t, RLC_BLOCK_COUNT, 8), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_t) + +static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_RNTI_t) + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_RNTI_t, Exist_G_RNTI_Extension, 1), + M_UINT (IU_Mode_Channel_Request_Desk_RNTI_t, G_RNTI_Extension, 4), + + M_TYPE (IU_Mode_Channel_Request_Desk_RNTI_t, IU_Mode_Channel_Request_Desk, IU_Mode_Channel_Request_Desk_t), + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_RNTI_t) + + +static const +CSN_DESCR_BEGIN(Ext_Channel_Request_desc_t) + + M_UINT (Ext_Channel_Request_desc_t, PFI, 7), + M_UINT (Ext_Channel_Request_desc_t, RADIO_PRIORITY, 2), + M_UINT (Ext_Channel_Request_desc_t, RLC_Mode, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_LCC_PDU, 1), + M_UINT (Ext_Channel_Request_desc_t, LCC_PDU, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (Ext_Channel_Request_desc_t) + +static const +CSN_DESCR_BEGIN(EGPRS_BEP_LinkQualityMeasurements_type2_t) + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_CV_BEP, 3), + +CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_type2_t) + +static const +CSN_DESCR_BEGIN(BEP_MeasurementReport_type2_t) + M_NEXT_EXIST (BEP_MeasurementReport_type2_t, Exist, 1), + M_UINT (BEP_MeasurementReport_type2_t, REPORTED_MODULATION, 2), + M_UINT (BEP_MeasurementReport_type2_t, MEAN_BEP_TN, 4), +CSN_DESCR_END (BEP_MeasurementReport_type2_t) + +static const +CSN_DESCR_BEGIN(InterferenceMeasurementReport_type2_t) + M_NEXT_EXIST (InterferenceMeasurementReport_type2_t, Exist, 1), + M_UINT (InterferenceMeasurementReport_type2_t, I_LEVEL, 4), +CSN_DESCR_END (InterferenceMeasurementReport_type2_t) +static const +CSN_DESCR_BEGIN(EGPRS_TimeslotLinkQualityMeasurements_type2_t) + M_NEXT_EXIST (EGPRS_TimeslotLinkQualityMeasurements_type2_t, Exist_BEP_MEASUREMENTS, 1), + M_TYPE_ARRAY (EGPRS_TimeslotLinkQualityMeasurements_type2_t, BEP_MEASUREMENTS, BEP_MeasurementReport_type2_t, 8), + + M_NEXT_EXIST (EGPRS_TimeslotLinkQualityMeasurements_type2_t, Exist_INTERFERENCE_MEASUREMENTS, 1), + M_TYPE_ARRAY (EGPRS_TimeslotLinkQualityMeasurements_type2_t, INTERFERENCE_MEASUREMENTS, InterferenceMeasurementReport_type2_t, 8), +CSN_DESCR_END (EGPRS_TimeslotLinkQualityMeasurements_type2_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR12_t) + + M_NEXT_EXIST (PRR_AdditionsR12_t, Exist_Downlink_eTFI, 1), + M_UINT (PRR_AdditionsR12_t, DOWNLINK_ETFI, 3), + +CSN_DESCR_END (PRR_AdditionsR12_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR10_t) + M_UINT (PRR_AdditionsR10_t, LOW_ACCESS_PRIORITY_SIGNALLING, 1), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR10_t, Exist_AdditionsR12, 1), + M_TYPE (PRR_AdditionsR10_t, AdditionsR12, PRR_AdditionsR12_t), + +CSN_DESCR_END (PRR_AdditionsR10_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR7_t) + M_UINT (PRR_AdditionsR7_t, EARLY_TBF_ESTABLISHMENT, 1), + + M_NEXT_EXIST (PRR_AdditionsR7_t, Exist_EGPRS_BEP_LinkQualityMeasurements_type2, 1), + M_TYPE (PRR_AdditionsR7_t, EGPRS_BEP_LinkQualityMeasurements_type2, EGPRS_BEP_LinkQualityMeasurements_type2_t), + + M_NEXT_EXIST (PRR_AdditionsR7_t, Exist_EGPRS_TimeslotLinkQualityMeasurements_type2, 1), + M_TYPE (PRR_AdditionsR7_t, EGPRS_TimeslotLinkQualityMeasurements_type2, EGPRS_TimeslotLinkQualityMeasurements_type2_t), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR7_t, Exist_AdditionsR10, 1), + M_TYPE (PRR_AdditionsR7_t, AdditionsR10, PRR_AdditionsR10_t), + +CSN_DESCR_END (PRR_AdditionsR7_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR6_t) + M_NEXT_EXIST (PRR_AdditionsR6_t, Exist_Ext_Channel_Request_desc, 1), + M_TYPE (PRR_AdditionsR6_t, Ext_Channel_Request_desc, Ext_Channel_Request_desc_t), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR6_t, Exist_AdditionsR7, 1), + M_TYPE (PRR_AdditionsR6_t, AdditionsR7, PRR_AdditionsR7_t), + +CSN_DESCR_END (PRR_AdditionsR6_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR5_t) + M_NEXT_EXIST (PRR_AdditionsR5_t, Exist_Iu_Mode_ChRequestDesk, 1), + M_TYPE (PRR_AdditionsR5_t, IU_Mode_Channel_Request_Desk_RNTI, IU_Mode_Channel_Request_Desk_RNTI_t), + + M_NEXT_EXIST (PRR_AdditionsR5_t, Exist_HFN_LSB, 1), + M_UINT (PRR_AdditionsR5_t, HFN_LSb, 7), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR5_t, Exist_AdditionsR6, 1), + M_TYPE (PRR_AdditionsR5_t, AdditionsR6, PRR_AdditionsR6_t), +CSN_DESCR_END (PRR_AdditionsR5_t) + +static const CSN_DESCR_BEGIN(PRR_AdditionsR99_t) M_NEXT_EXIST (PRR_AdditionsR99_t, Exist_EGPRS_BEP_LinkQualityMeasurements, 1), M_TYPE (PRR_AdditionsR99_t, EGPRS_BEP_LinkQualityMeasurements, EGPRS_BEP_LinkQualityMeasurements_t), @@ -1143,6 +1289,10 @@ M_UINT (PRR_AdditionsR99_t, MS_RAC_AdditionalInformationAvailable, 1), M_UINT (PRR_AdditionsR99_t, RetransmissionOfPRR, 1), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR99_t, Exist_AdditionsR5, 1), + M_TYPE (PRR_AdditionsR99_t, AdditionsR5, PRR_AdditionsR5_t), + CSN_DESCR_END (PRR_AdditionsR99_t) static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index c1869ae..9e80f52 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -1443,6 +1443,148 @@ guint8 CV_BEP_8PSK; } EGPRS_BEP_LinkQualityMeasurements_t; +typedef struct{ +guint8 RB_ID; +guint8 RADIO_PRIORITY; + +gboolean Exist_RLC_BLOCK_COUNT; +guint8 RLC_BLOCK_COUNT; + +gboolean Exist_Iu_Mode_ChRequestDesk; +//IU_Mode_Channel_Request_Desk_t IU_Mode_Channel_Request_Desk1; + +} IU_Mode_Channel_Request_Desk_t; + +typedef struct{ + gboolean Exist_G_RNTI_Extension; + guint8 G_RNTI_Extension; + IU_Mode_Channel_Request_Desk_t IU_Mode_Channel_Request_Desk; + +} IU_Mode_Channel_Request_Desk_RNTI_t; + +typedef struct{ + guint8 PFI; + guint8 RADIO_PRIORITY; + guint8 RLC_Mode; + + gboolean Exist_LCC_PDU; + guint8 LCC_PDU; + + gboolean Exist_Ext_Channel_Request_desc; + +} Ext_Channel_Request_desc_t; + + +typedef struct{ + gboolean Exist_GMSK_MEAN_BEP; + guint8 GMSK_MEAN_BEP; + guint8 GMSK_CV_BEP; + + gboolean Exist_8PSK_MEAN_BEP; + guint8 p8PSK_MEAN_BEP; + guint8 p8PSK_CV_BEP; + + gboolean Exist_QPSK_MEAN_BEP; + guint8 QPSK_MEAN_BEP; + guint8 QPSK_CV_BEP; + + gboolean Exist_16QAM_NSR_MEAN_BEP; + guint8 p16QAM_NSR_MEAN_BEP; + guint8 p16QAM_NSR_CV_BEP; + + gboolean Exist_32QAM_NSR_MEAN_BEP; + guint8 p32QAM_NSR_MEAN_BEP; + guint8 p32QAM_NSR_CV_BEP; + + gboolean Exist_16QAM_HSR_MEAN_BEP; + guint8 p16QAM_HSR_MEAN_BEP; + guint8 p16QAM_HSR_CV_BEP; + + gboolean Exist_32QAM_HSR_MEAN_BEP; + guint8 p32QAM_HSR_MEAN_BEP; + guint8 p32QAM_HSR_CV_BEP; + +} EGPRS_BEP_LinkQualityMeasurements_type2_t; + +typedef struct +{ + gboolean Exist; + guint8 REPORTED_MODULATION; + guint8 MEAN_BEP_TN; + +} BEP_MeasurementReport_type2_t; + +typedef struct +{ + gboolean Exist; + guint8 I_LEVEL; +} InterferenceMeasurementReport_type2_t; + +typedef struct +{ + gboolean Exist_BEP_MEASUREMENTS; + BEP_MeasurementReport_type2_t BEP_MEASUREMENTS[8]; + + gboolean Exist_INTERFERENCE_MEASUREMENTS; + InterferenceMeasurementReport_type2_t INTERFERENCE_MEASUREMENTS[8]; + +} EGPRS_TimeslotLinkQualityMeasurements_type2_t; + + +typedef struct +{ + gboolean Exist_Downlink_eTFI; + guint8 DOWNLINK_ETFI; + +} PRR_AdditionsR12_t; + +typedef struct +{ + guint8 LOW_ACCESS_PRIORITY_SIGNALLING; + + gboolean Exist_AdditionsR12; + PRR_AdditionsR12_t AdditionsR12; + +} PRR_AdditionsR10_t; + +typedef struct +{ + guint8 EARLY_TBF_ESTABLISHMENT; + + gboolean Exist_EGPRS_BEP_LinkQualityMeasurements_type2; + EGPRS_BEP_LinkQualityMeasurements_type2_t EGPRS_BEP_LinkQualityMeasurements_type2; + + gboolean Exist_EGPRS_TimeslotLinkQualityMeasurements_type2; + EGPRS_TimeslotLinkQualityMeasurements_type2_t EGPRS_TimeslotLinkQualityMeasurements_type2; + + gboolean Exist_AdditionsR10; + PRR_AdditionsR10_t AdditionsR10; + +} PRR_AdditionsR7_t; + +typedef struct +{ + gboolean Exist_Ext_Channel_Request_desc; + Ext_Channel_Request_desc_t Ext_Channel_Request_desc; + + guint8 Exist_AdditionsR7; + PRR_AdditionsR7_t AdditionsR7; + +} PRR_AdditionsR6_t; + +typedef struct +{ + guint8 Exist_Iu_Mode_ChRequestDesk; + IU_Mode_Channel_Request_Desk_RNTI_t IU_Mode_Channel_Request_Desk_RNTI; + + guint8 Exist_HFN_LSB; + guint8 HFN_LSb; + + guint8 Exist_AdditionsR6; + PRR_AdditionsR6_t AdditionsR6; + +} PRR_AdditionsR5_t; + typedef struct { gboolean Exist_EGPRS_BEP_LinkQualityMeasurements; @@ -1456,6 +1598,9 @@ guint8 MS_RAC_AdditionalInformationAvailable; guint8 RetransmissionOfPRR; + + guint8 Exist_AdditionsR5; + PRR_AdditionsR5_t AdditionsR5; } PRR_AdditionsR99_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 Gerrit-Change-Number: 17051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:27 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17052 ) Change subject: gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN ...................................................................... gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN Port from wireshark.git f751918476bdde65f2289b86245a3c30dace6730. Ported-by: Pau Espin Pedrol Change-Id: I70d4ff3e137b5fd13d367bd4ea6ab501e81e7a87 --- M src/gsm_rlcmac.cpp 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/17052/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 16a378d..5bf7b1d 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -1139,7 +1139,10 @@ M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_RLC_BLOCK_COUNT, 1), M_UINT (IU_Mode_Channel_Request_Desk_t, RLC_BLOCK_COUNT, 8), - M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + /* Don't use M_REC_TARRAY as we don't support multiple TBFs + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), + M_TYPE (IU_Mode_Channel_Request_Desk1, IU_Mode_Channel_Request_Desk_t),*/ + M_UINT (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), CSN_DESCR_END (IU_Mode_Channel_Request_Desk_t) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I70d4ff3e137b5fd13d367bd4ea6ab501e81e7a87 Gerrit-Change-Number: 17052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 18:20:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jan 2020 18:20:27 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17053 ) Change subject: gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ASAN ...................................................................... gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ASAN Port from wireshark.git aa3bbe5aebdc180172e7956719b26199e4784fcc. Ported-by: Pau Espin Pedrol Change-Id: I808ec66011cdfe8e1193298f7fb7e92d25b45be4 --- M src/gsm_rlcmac.cpp 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/17053/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 5bf7b1d..906088c 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -1167,7 +1167,10 @@ M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_LCC_PDU, 1), M_UINT (Ext_Channel_Request_desc_t, LCC_PDU, 1), - M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + /* Don't use M_REC_TARRAY as we don't support multiple TBFs + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), + M_TYPE (Ext_Channel_Request_desc_t, Ext_Channel_Request_desc, Ext_Channel_Request_desc_t),*/ + M_UINT (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), CSN_DESCR_END (Ext_Channel_Request_desc_t) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I808ec66011cdfe8e1193298f7fb7e92d25b45be4 Gerrit-Change-Number: 17053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 19:07:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 19:07:25 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix an out of bounds access In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17048 ) Change subject: gsm_rlcmac.cpp: fix an out of bounds access ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I23fb2199fc8f9cc3e5bd475e2558ee8d482df1e1 Gerrit-Change-Number: 17048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 19:07:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 19:29:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 19:29:12 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: add dissection of NAS container In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17049 ) Change subject: gsm_rlcmac: add dissection of NAS container ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36 Gerrit-Change-Number: 17049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 19:29:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 19:45:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 19:45:14 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: improve dissection of Packet Resource Request message In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17050 ) Change subject: gsm_rlcmac: improve dissection of Packet Resource Request message ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17050/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/17050/1//COMMIT_MSG at 11 PS1, Line 11: This commit breaks a unit test. We still need to investigate why this happens. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibb4cbd3f5865415fd547e95fc24ff31df1aed4c0 Gerrit-Change-Number: 17050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 28 Jan 2020 19:45:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:28:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:28:43 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:32:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:32:55 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 21:32:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:33:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:33:15 +0000 Subject: Change in osmo-pcu[master]: csn1: shuffle decrements of remaining_bits_len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16996 ) Change subject: csn1: shuffle decrements of remaining_bits_len ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 Gerrit-Change-Number: 16996 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:33:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:33:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:33:34 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix an infinite loop in CSN.1 dissector when having more than 2... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17000 ) Change subject: csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 Gerrit-Change-Number: 17000 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:33:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:33:46 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix warning with -Wmissing-prototypes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17001 ) Change subject: csn1: Fix warning with -Wmissing-prototypes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 Gerrit-Change-Number: 17001 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:33:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:18 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16994 ) Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:34:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:28 +0000 Subject: Change in osmo-pcu[master]: csn1: Don't cast away constness In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17002 ) Change subject: csn1: Don't cast away constness ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 Gerrit-Change-Number: 17002 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:31 +0000 Subject: Change in osmo-pcu[master]: csn1: Try to fix cast discards '__attribute__((const))' qualifier fro... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17003 ) Change subject: csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 Gerrit-Change-Number: 17003 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:34:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:41 +0000 Subject: Change in osmo-pcu[master]: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16993 ) Change subject: tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails ...................................................................... tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails Currently code using that function in osmo-pcu is disabled, allegadly because SGSN was sending incorrect values, but it looks more like a CSN1 issue. Related: OS#1525, OS#3499 Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.ok 4 files changed, 49 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ef7abcd..339279c 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -5510,10 +5510,10 @@ } } -void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data) +int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data) { csnStream_t ar; unsigned readIndex = 0; csnStreamInit(&ar, 0, 8 * vector->data_len); - /*ret =*/ csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data); + return csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, readIndex, data); } diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index a4750e8..0ac1207 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -5137,5 +5137,5 @@ void encode_gsm_rlcmac_uplink(bitvec * vector, RlcMacUplink_t * data); void decode_gsm_rlcmac_uplink_data(bitvec * vector, RlcMacUplinkDataBlock_t * data); void encode_gsm_rlcmac_downlink_data(bitvec * vector, RlcMacDownlinkDataBlock_t * data); - void decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data); + int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data); #endif /* __PACKET_GSM_RLCMAC_H__ */ diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index e48a27c..b51d735 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -23,9 +23,11 @@ #include #include #include +#include #include "csn1.h" #include "gsm_rlcmac.h" #include "gprs_rlcmac.h" +#include "decoding.h" extern "C" { extern const struct log_info gprs_log_info; @@ -38,6 +40,8 @@ } using namespace std; +void *tall_pcu_ctx; + void printSizeofRLCMAC() { printf("*** %s ***\n", __func__); @@ -203,6 +207,45 @@ msgb_free(m); } +void testRAcap(void *test_ctx) +{ + printf("*** %s ***\n", __func__); + MS_Radio_Access_capability_t data; + memset(&data, 0, sizeof(data)); + bitvec *vector = bitvec_alloc(23, test_ctx); + int rc; +/* + MS RA capability 1 + 0001 .... = Access Technology Type: GSM E --note that GSM E covers GSM P (1) + .... 0010 101. .... = Length in bits: 0x15 (21) + ...0 01.. RF Power Capability, GMSK Power Class: Not specified (1) + A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0) + .... ...1 = Controlled early Classmark Sending: Implemented + 0... .... = Pseudo Synchronisation: Not Present + .0.. .... = Voice Group Call Service: no VGCS capability or no notifications wanted + ..0. .... = Voice Broadcast Service: no VBS capability or no notifications wanted + ...1 .... = Multislot capability struct: Present + .... ..00 011. .... = GPRS multislot class: Max Rx-Slot/TDMA:2 Max Tx-Slot/TDMA:2 Max-Sum-Slot/TDMA:3 Tta:3 Ttb:2 Tra:3 Trb:1 Type:1 (3) + ...0 .... = GPRS Extended Dynamic Allocation Capability: Not Implemented +*/ + bitvec_unhex(vector, "12a5146200"); + + rc = decode_gsm_ra_cap(vector, &data); + printf("decode_gsm_ra_cap fails? %s\n", rc !=0 ? "yes" : "no"); +#if 0 + /* FIXME: OS#1525, OS#3499: csn1 fails to parse this MS RA Cap IE value */ + assert (rc == 0); + + /* Make sure there's 1 value (currently fails due to failed decoding) */ + osmo_assert(cap->Count_MS_RA_capability_value == 1); + + /* Make sure MS multislot class is parsed correctly (currently fails due + to failed decoding and count being 0) */ + uint8_t ms_class = Decoding::get_ms_class_by_capability(&data); + assert(ms_class == 3); +#endif +} + int main(int argc, char *argv[]) { void *ctx = talloc_named_const(NULL, 1, "RLCMACTest"); @@ -213,5 +256,6 @@ testRlcMacDownlink(ctx); testRlcMacUplink(ctx); testCsnLeftAlignedVarBmpBounds(ctx); + testRAcap(ctx); talloc_free(ctx); } diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 2af4d90..5793d57 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -123,3 +123,5 @@ vector2 = 40 0a 90 20 00 00 00 00 00 00 00 30 10 01 2a 08 00 13 2b 2b 2b 2b 2b vector1 == vector2 : TRUE *** testCsnLeftAlignedVarBmpBounds *** +*** testRAcap *** +decode_gsm_ra_cap fails? yes -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92c86397f988afaa791871d823a45fa85054f3bb Gerrit-Change-Number: 16993 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:41 +0000 Subject: Change in osmo-pcu[master]: csn1: Update M_NULL CSN_DESCR to match wireshark In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16994 ) Change subject: csn1: Update M_NULL CSN_DESCR to match wireshark ...................................................................... csn1: Update M_NULL CSN_DESCR to match wireshark Port from iwireshark.git commit cc6d4341e65ef2e8d8488fe0ac0f236ece0dd844. It looks like it makes no difference to us now, but other EGPRS messages may use it in the future. Ported-by: Pau Espin Pedrol Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 --- M src/csn1.cpp M src/csn1.h M src/gsm_rlcmac.cpp 3 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 6203a44..9ddb9c1 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -190,6 +190,7 @@ case CSN_NULL: { /* Empty member! */ + bit_offset += pDescr->i; pDescr++; break; } @@ -631,6 +632,7 @@ case CSN_NULL: { /* Empty member! */ + bit_offset += pDescr->i; pDescr++; break; } diff --git a/src/csn1.h b/src/csn1.h index 1015e69..39e6625 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -592,8 +592,8 @@ #define M_PADDING_BITS(_STRUCT)\ {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {(StreamSerializeFcn_t)0}} -#define M_NULL(_STRUCT, _MEMBER)\ - {CSN_NULL, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} +#define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} #define M_THIS_EXIST(_STRUCT)\ {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 339279c..c1d3b97 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -605,7 +605,7 @@ static const CSN_ChoiceElement_t SI13_PBCCH_Description_Channel[] = {/* this one is used in SI13*/ - {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy)},/*Default to BCCH carrier*/ + {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ {2, 0x01 , M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, {1, 0x01 , M_UINT(PBCCH_Description_t, u.MAIO, 6)}, }; @@ -3064,7 +3064,7 @@ static const CSN_DESCR_BEGIN (Delete_All_Stored_Individual_Priorities_t) - M_NULL (Delete_All_Stored_Individual_Priorities_t, dummy), + M_NULL (Delete_All_Stored_Individual_Priorities_t, dummy, 0), CSN_DESCR_END (Delete_All_Stored_Individual_Priorities_t) static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I34039370c292e62790a38abb59f55c69fffa88e8 Gerrit-Change-Number: 16994 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:42 +0000 Subject: Change in osmo-pcu[master]: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16995 ) Change subject: csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function ...................................................................... csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function Port from wireshark.git commit fd9f182f4b13a3d81b1b5c797a6e4b9d6d327fdd. Ported-by: Pau Espin Pedrol Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 9ddb9c1..1174347 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -147,7 +147,7 @@ { gint remaining_bits_len = ar->remaining_bits_len; gint bit_offset = ar->bit_offset; - guint8* pui8; + guint8* pui8 = NULL; guint16* pui16; guint32* pui32; guint64* pui64; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I37f5f3732f92cd7340af8ac1e04383f3e45e7636 Gerrit-Change-Number: 16995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:42 +0000 Subject: Change in osmo-pcu[master]: csn1: shuffle decrements of remaining_bits_len In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16996 ) Change subject: csn1: shuffle decrements of remaining_bits_len ...................................................................... csn1: shuffle decrements of remaining_bits_len So that they always occur next to an increment of bit_offset. Port from wireshark.git 1c81971d4292438ffdf83e9f9b9ab96c133c785b. Ported-by: Pau Espin Pedrol Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 --- M src/csn1.cpp 1 file changed, 14 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 1174347..f7e9be0 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1243,6 +1243,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)bitvec_read_field(vector, &readIndex, 1)); /* existNextElement() returned FALSE, 1 bit consumed */ bit_offset++; + remaining_bits_len--; /* Store the counted number of elements of the array */ *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; @@ -1567,7 +1568,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= no_of_bits; if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1608,7 +1608,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= (no_of_bits*nCount); if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1617,6 +1616,7 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; } while (--nCount > 0); } @@ -1887,7 +1887,7 @@ pui8 = pui8DATA(data, pDescr->offset); bitvec_write_field(vector, &writeIndex, *pui8, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; + remaining_bits_len--; bit_offset++; pDescr++; break; @@ -1904,8 +1904,6 @@ guint8 no_of_bits = (guint8) pDescr->i; if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= no_of_bits; - if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -1934,6 +1932,7 @@ return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); } + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; pDescr++; break; @@ -2026,7 +2025,6 @@ if (remaining_bits_len >= no_of_bits) { - remaining_bits_len -= (no_of_bits*nCount); if (no_of_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); @@ -2035,6 +2033,7 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; + remaining_bits_len -= no_of_bits; bit_offset += no_of_bits; } while (--nCount > 0); } @@ -2191,8 +2190,9 @@ writeIndex--; bitvec_write_field(vector, &writeIndex, fExist, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz, (unsigned)fExist); + remaining_bits_len--; + bit_offset++; pDescr++; - remaining_bits_len -= 1; if (!exist) { @@ -2222,9 +2222,9 @@ bitvec_write_field(vector, &writeIndex, *pui8, 1); fExist = *pui8; LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; - ++bit_offset; + remaining_bits_len--; + bit_offset++; if (fExist == 0) { /* Skip 'i' entries */ @@ -2247,12 +2247,6 @@ /* skip 'i' entries + this entry */ pDescr += pDescr->i + 1; - /* pDescr now must be pointing to a CSN_END entry, if not this is an error */ - if ( pDescr->type != CSN_END ) - { /* substract one more bit from remaining_bits_len to make the "not enough bits" error to be triggered */ - remaining_bits_len--; - } - /* set the data member to "not exist" */ //*pui8 = 0; break; @@ -2265,8 +2259,8 @@ writeIndex--; bitvec_write_field(vector, &writeIndex, fExist, 1); pui8++; - remaining_bits_len -= 1; + remaining_bits_len--; bit_offset++; if (fExist == 0) @@ -2299,7 +2293,6 @@ if (no_of_bits > 0) { - remaining_bits_len -= no_of_bits; if (remaining_bits_len < 0) { @@ -2317,6 +2310,7 @@ pui8++; no_of_bits -= nB1; bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + remaining_bits_len -= nB1; } /* remaining no_of_bits is a multiple of 8 or 0 */ @@ -2326,6 +2320,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; no_of_bits -= 8; + remaining_bits_len -= 8; } } } @@ -2444,8 +2439,6 @@ if (count > 0) { - remaining_bits_len -= count * 8; - if (remaining_bits_len < 0) { return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); @@ -2459,6 +2452,7 @@ LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; bit_offset += 8; + remaining_bits_len -= 8; count--; } } @@ -2491,7 +2485,6 @@ bitvec_write_field(vector, &writeIndex, *pui8, no_of_bits); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)*pui8); pui8++; - remaining_bits_len -= no_of_bits; ElementCount--; if (remaining_bits_len < 0) @@ -2500,6 +2493,7 @@ } bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; } bitvec_write_field(vector, &writeIndex, !Tag, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7474e9d632e068d6e33b0a502b81d4fff1f48802 Gerrit-Change-Number: 16996 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:42 +0000 Subject: Change in osmo-pcu[master]: csn1: Extend CSN_SERIALIZE to allow 0 bit of length In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16997 ) Change subject: csn1: Extend CSN_SERIALIZE to allow 0 bit of length ...................................................................... csn1: Extend CSN_SERIALIZE to allow 0 bit of length Port of wireshark.git 2f024256bf337400ef3a82fa75e6d48d5707e059. >From c6ee558d3bb00bfd25cca7c534448bf60df3c7cf Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 4 Feb 2012 10:24:01 +0100 Subject: [PATCH 6/6] packet-csn: Extend CSN_SERIALIZE to allow 0 bit of length In some coding there is no 'length' field at the top of a serialized block, or it's more complex than a single field, in which case we have to rely on the serialize decoder to consume the correct number of bits. We extend the CSN_SERIALIZE processing so that if a '0 bit' length field is specified, then the length is not displayed and the consumed bits by the serialize function is taken as the length at posteriori. The processing keeps the same behavior for any length > 0. Change-Id: I9fadc99218594447001f7bb9943f4514b9877799 --- M src/csn1.cpp 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index f7e9be0..4f761c7 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -548,15 +548,20 @@ bit_offset += length_len; remaining_bits_len -= length_len; - csnStreamInit(&arT, bit_offset, length); + csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); arT.direction = 1; LOGPC(DCSN1, LOGL_NOTICE, "ptr = %p | offset = %d | ", (void *)data, (int)pDescr->offset); Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); if (Status >= 0) { - remaining_bits_len -= length; - bit_offset += length; + if (length > 0) { + remaining_bits_len -= length; + bit_offset += length; + } else { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } pDescr++; } else -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fadc99218594447001f7bb9943f4514b9877799 Gerrit-Change-Number: 16997 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:42 +0000 Subject: Change in osmo-pcu[master]: csn1: Allow CHOICE elements to re-process the bits used for the choice In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16998 ) Change subject: csn1: Allow CHOICE elements to re-process the bits used for the choice ...................................................................... csn1: Allow CHOICE elements to re-process the bits used for the choice This is a port of wireshark.git commit 2f024256bf337400ef3a82fa75e6d48d5707e059. >From 78516187d821b8d19d16987b1d6bc855ee7cbe10 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 4 Feb 2012 10:00:22 +0100 Subject: [PATCH 4/6] packet-csn1: Allow CHOICE elements to re-process the bits used for the choice We may want to display more detail, or the sub-element should be displayed with its headers or whatever ... Change-Id: I3a5a95d5f918b8f17a2400a6d0c4d855ecacea7e --- M src/csn1.cpp M src/csn1.h M src/gsm_rlcmac.cpp 3 files changed, 47 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 4f761c7..8e123fb 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -507,8 +507,10 @@ pui8 = pui8DATA(data, pDescr->offset); *pui8 = i; LOGPC(DCSN1, LOGL_NOTICE, "Choice %s = %u | ", pDescr->sz , (unsigned)value); - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; + if (!pChoice->keep_bits) { + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); diff --git a/src/csn1.h b/src/csn1.h index 39e6625..e927076 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -212,6 +212,7 @@ { guint8 bits; guint8 value; + gboolean keep_bits; CSN_DESCR descr; } CSN_ChoiceElement_t; diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c1d3b97..ed7c745 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -387,9 +387,9 @@ static const CSN_ChoiceElement_t IA_EGPRS_Choice[] = { - {2, 0x00, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, - {2, 0x01, CSN_ERROR(IA_EGPRS_t, "01 ", CSN_ERROR_STREAM_NOT_SUPPORTED)}, - {1, 0x01, CSN_ERROR(IA_EGPRS_t, "1 ", CSN_ERROR_STREAM_NOT_SUPPORTED)} + {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)}, + {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 ", CSN_ERROR_STREAM_NOT_SUPPORTED)}, + {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 ", CSN_ERROR_STREAM_NOT_SUPPORTED)} }; /* Please observe the double usage of UnionType element. @@ -526,10 +526,10 @@ static const CSN_ChoiceElement_t PacketPollingID[] = { - {1, 0, M_TYPE(PacketPollingID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketPollingID_t, u.TLLI, 32)}, - {3, 0x06, M_UINT(PacketPollingID_t, u.TQI, 16)}, -/*{3, 0x07 , M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)},*/ + {1, 0, 0, M_TYPE(PacketPollingID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketPollingID_t, u.TLLI, 32)}, + {3, 0x06, 0, M_UINT(PacketPollingID_t, u.TQI, 16)}, +/*{3, 0x07 , 0, M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)},*/ }; static const @@ -605,9 +605,9 @@ static const CSN_ChoiceElement_t SI13_PBCCH_Description_Channel[] = {/* this one is used in SI13*/ - {2, 0x00 , M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ - {2, 0x01 , M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, - {1, 0x01 , M_UINT(PBCCH_Description_t, u.MAIO, 6)}, + {2, 0x00, 0, M_NULL(PBCCH_Description_t, u.dummy, 0)},/*Default to BCCH carrier*/ + {2, 0x01, 0, M_UINT(PBCCH_Description_t, u.ARFCN, 10)}, + {1, 0x01, 0, M_UINT(PBCCH_Description_t, u.MAIO, 6)}, }; static const @@ -895,12 +895,12 @@ static const CSN_ChoiceElement_t MS_RA_capability_value_Choice[] = { - {4, AccTech_GSMP, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSME, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1800, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM1900, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSM850, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ - {4, AccTech_GSMOther, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ + {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */ + {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */ }; static const @@ -928,12 +928,12 @@ static const CSN_ChoiceElement_t MultibandChoice[] = { - {3, 0x00, M_UINT(Multiband_t, u.A5_Bits, 4)}, - {3, 0x05, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x06, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x01, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x02, M_TYPE(Multiband_t, u.ARC, ARC_t)}, - {3, 0x04, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)}, + {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, + {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)}, }; static const @@ -1053,8 +1053,8 @@ static const CSN_ChoiceElement_t PacketResourceRequestID[] = { - {1, 0, M_TYPE(PacketResourceRequestID_t, u.Global_TFI, Global_TFI_t)}, - {1, 0x01, M_UINT(PacketResourceRequestID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketResourceRequestID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x01, 0, M_UINT(PacketResourceRequestID_t, u.TLLI, 32)}, }; static const @@ -1732,10 +1732,10 @@ static const CSN_ChoiceElement_t PacketUplinkID[] = { - {1, 0 , M_TYPE(PacketUplinkID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02 , M_UINT(PacketUplinkID_t, u.TLLI, 32)}, - {3, 0x06 , M_UINT(PacketUplinkID_t, u.TQI, 16)}, - {3, 0x07 , M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {1, 0, 0, M_TYPE(PacketUplinkID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketUplinkID_t, u.TLLI, 32)}, + {3, 0x06, 0, M_UINT(PacketUplinkID_t, u.TQI, 16)}, + {3, 0x07, 0, M_TYPE(PacketUplinkID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, }; static const @@ -1866,8 +1866,8 @@ static const CSN_ChoiceElement_t PacketDownlinkID[] = { - {1, 0, M_TYPE(PacketDownlinkID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketDownlinkID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketDownlinkID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketDownlinkID_t, u.TLLI, 32)}, }; static const @@ -2106,9 +2106,9 @@ static const CSN_ChoiceElement_t PacketPowerControlTimingAdvanceID[] = { - {1, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Global_TFI, Global_TFI_t)}, - {3, 0x06, M_UINT(PacketPowerControlTimingAdvanceID_t, u.TQI, 16)}, - {3, 0x07, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {1, 0, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Global_TFI, Global_TFI_t)}, + {3, 0x06, 0, M_UINT(PacketPowerControlTimingAdvanceID_t, u.TQI, 16)}, + {3, 0x07, 0, M_TYPE(PacketPowerControlTimingAdvanceID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, }; static const @@ -2388,9 +2388,9 @@ static const CSN_ChoiceElement_t RejectID[] = { - {1, 0x00, M_UINT(RejectID_t, u.TLLI, 32)}, - {2, 0x02, M_TYPE(RejectID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, - {2, 0x03, M_TYPE(RejectID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x00, 0, M_UINT(RejectID_t, u.TLLI, 32)}, + {2, 0x02, 0, M_TYPE(RejectID_t, u.Packet_Request_Reference, Packet_Request_Reference_t)}, + {2, 0x03, 0, M_TYPE(RejectID_t, u.Global_TFI, Global_TFI_t)}, }; static const @@ -2421,8 +2421,8 @@ static const CSN_ChoiceElement_t PacketCellChangeOrderID[] = { - {1, 0, M_TYPE(PacketCellChangeOrderID_t, u.Global_TFI, Global_TFI_t)}, - {2, 0x02, M_UINT(PacketCellChangeOrderID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(PacketCellChangeOrderID_t, u.Global_TFI, Global_TFI_t)}, + {2, 0x02, 0, M_UINT(PacketCellChangeOrderID_t, u.TLLI, 32)}, }; /* PacketCellChangeOrderID_t; */ @@ -3819,8 +3819,8 @@ static const CSN_ChoiceElement_t PNCDContainer[] = { - {1, 0x0, M_TYPE(PNCDContainer_t, u.PNCD_Container_Without_ID, PNCD_Container_Without_ID_t)}, - {1, 0x1, M_TYPE(PNCDContainer_t, u.PNCD_Container_With_ID, PNCD_Container_With_ID_t)}, + {1, 0x0, 0, M_TYPE(PNCDContainer_t, u.PNCD_Container_Without_ID, PNCD_Container_Without_ID_t)}, + {1, 0x1, 0, M_TYPE(PNCDContainer_t, u.PNCD_Container_With_ID, PNCD_Container_With_ID_t)}, }; static const @@ -4124,8 +4124,8 @@ static const CSN_ChoiceElement_t AdditionalMsRadAccessCapID[] = { - {1, 0, M_TYPE(AdditionalMsRadAccessCapID_t, u.Global_TFI, Global_TFI_t)}, - {1, 0x01, M_UINT(AdditionalMsRadAccessCapID_t, u.TLLI, 32)}, + {1, 0, 0, M_TYPE(AdditionalMsRadAccessCapID_t, u.Global_TFI, Global_TFI_t)}, + {1, 0x01, 0, M_UINT(AdditionalMsRadAccessCapID_t, u.TLLI, 32)}, }; static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3a5a95d5f918b8f17a2400a6d0c4d855ecacea7e Gerrit-Change-Number: 16998 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:43 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix pedantic compiler warnings in csn.1 dissectors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16999 ) Change subject: csn1: Fix pedantic compiler warnings in csn.1 dissectors ...................................................................... csn1: Fix pedantic compiler warnings in csn.1 dissectors Port of wireshark.git commit 6aca10831f86c562970b13efa811f46e25ee3091. From Mike Morrin: Fix pedantic compiler warnings in csn.1 dissectors. There is some tricky casting going on in csn.1 structures. To eliminate all the warnings, the function pointers needed to be moved out of the object pointer unions. Fortunately macros (mostly) hide these changes from the protocol dissector tables. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 svn path=/trunk/; revision=44899 Change-Id: Ia1a8c50c4b024ca6df4e3fbbf891cd33591ccc9b --- M src/csn1.cpp M src/csn1.h 2 files changed, 58 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 8e123fb..493d471 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -335,7 +335,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -382,7 +382,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -539,7 +539,7 @@ case CSN_SERIALIZE: { - StreamSerializeFcn_t serialize = pDescr->serialize.fcn; + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; csnStream_t arT = *ar; guint8 length_len = pDescr->i; gint16 Status = -1; @@ -762,7 +762,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -821,7 +821,7 @@ gint16 Status; csnStream_t arT = *ar; guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->serialize.value; + guint16 nSize = (guint16)(guint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); @@ -1264,7 +1264,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); @@ -1327,7 +1327,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; csnStream_t arT = *ar; gboolean EndOfList = FALSE; @@ -1608,7 +1608,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -1655,7 +1655,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -1801,7 +1801,7 @@ case CSN_SERIALIZE: { - StreamSerializeFcn_t serialize = pDescr->serialize.fcn; + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; csnStream_t arT = *ar; guint8 length_len = pDescr->i; gint16 Status = -1; @@ -2025,7 +2025,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->serialize.value != 0) + if (pDescr->format_p.value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -2072,7 +2072,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->serialize.value; + guint16 nSize = (guint16)(gint32)pDescr->format_p.value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2517,7 +2517,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); /* Store the counted number of elements of the array */ @@ -2579,7 +2579,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->serialize.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; guint8 ElementCount = 0; guint8 ElementNum = 0; csnStream_t arT = *ar; diff --git a/src/csn1.h b/src/csn1.h index e927076..c5ee919 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -77,6 +77,7 @@ #ifndef ElementsOf #define ElementsOf(array) (sizeof(array) / sizeof(array[0])) #endif +typedef void(*void_fn_t)(void); /* Context holding CSN1 parameters */ typedef struct @@ -194,7 +195,7 @@ gint16 i; union { - void* ptr; + const void* ptr; guint32 value; } descr; unsigned offset; @@ -202,10 +203,11 @@ const char* sz; union { - StreamSerializeFcn_t fcn; + void * dummy; /* to eliminate --pedantic compiler warnings */ guint32 value; int* hf_ptr; - } serialize; + } format_p; + void_fn_t aux_fn; } CSN_DESCR; typedef struct @@ -244,7 +246,7 @@ CSN_DESCR CSNDESCR_##_STRUCT[] = { #define CSN_DESCR_END(_STRUCT)\ - {CSN_END, 0, {0}, 0, FALSE, "", {(StreamSerializeFcn_t)0}} }; + {CSN_END, 0, {0}, 0, FALSE, "", {NULL}, NULL} }; /****************************************************************************** * CSN_ERROR(Par1, Par2, Par3) @@ -255,7 +257,7 @@ * Par3: Error code *****************************************************************************/ #define CSN_ERROR(_STRUCT, _Text, _ERRCODE)\ - {CSN_TRAP_ERROR, _ERRCODE, {(void*)_Text}, 0, FALSE, _Text, {(StreamSerializeFcn_t)0}} + {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, {NULL}, NULL} /****************************************************************************** * M_BIT(Par1, Par2) @@ -264,7 +266,7 @@ * Par2: C structure element name *****************************************************************************/ #define M_BIT(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_BIT_OR_NULL(Par1, Par2) @@ -274,11 +276,11 @@ * Covers the case {null | 0 | 1} *****************************************************************************/ #define M_BIT_OR_NULL(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST(Par1, Par2, Par3) - * Indicates whether the next element or a group of elements defined in the + * Indicates whether the next element or a group of elements defined in the * structure is present or not. * Par1: C structure name * Par2: C structure element name @@ -286,7 +288,7 @@ * element(s) does not exist *****************************************************************************/ #define M_NEXT_EXIST(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_LH(Par1, Par2, Par3) @@ -296,7 +298,7 @@ * pattern 0x2B is performed on the read bit before the decision is made. *****************************************************************************/ #define M_NEXT_EXIST_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL(Par1, Par2, Par3) @@ -306,7 +308,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL_LH(Par1, Par2, Par3) @@ -316,7 +318,7 @@ * Covers the case {null | L | H < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -326,7 +328,7 @@ * Par3: number of bits used to code the element (between 1 and 32) *****************************************************************************/ #define M_UINT(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {(void*)1}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_OR_NULL(Par1, Par2, Par3) @@ -336,7 +338,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_UINT_OR_NULL(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -346,7 +348,7 @@ * received CSN.1 message *****************************************************************************/ #define M_UINT_LH(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT_LH, _BITS, {(void*)1}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_OFFSET(Par1, Par2, Par3, Par4) @@ -357,7 +359,7 @@ * Par4: value added to the returned integer (offset) *****************************************************************************/ #define M_UINT_OFFSET(_STRUCT, _MEMBER, _BITS, _OFFSET)\ - {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -368,7 +370,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCount)\ - {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -380,7 +382,7 @@ * structure member holding the length value *****************************************************************************/ #define M_VAR_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCountField)\ - {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)1}} + {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)1}, NULL} /****************************************************************************** * M_VAR_ARRAY(Par1, Par2, Par3, Par4) @@ -391,7 +393,7 @@ * Par4: offset that is added to the Par3 to get the actual size of the array *****************************************************************************/ #define M_VAR_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TARRAY(Par1, Par2, Par3, Par4) @@ -402,14 +404,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -427,7 +429,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -438,7 +440,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -450,7 +452,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -458,7 +460,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -466,7 +468,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)}} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) @@ -477,7 +479,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UNION(Par1, Par2) @@ -490,14 +492,14 @@ * Par2: number of possible choice in the union *****************************************************************************/ #define M_UNION(_STRUCT, _COUNT)\ - {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {(StreamSerializeFcn_t)0}} + {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} /****************************************************************************** * M_UNION_LH(Par1, Par2) * Same as M_UNION but masked with background value 0x2B *****************************************************************************/ #define M_UNION_LH(_STRUCT, _COUNT)\ - {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {(StreamSerializeFcn_t)0}} + {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} /****************************************************************************** * M_CHOICE(Par1, Par2, Par3, Par4) @@ -526,7 +528,7 @@ * Par4: number of possible choices in the union *****************************************************************************/ #define M_CHOICE(_STRUCT, _MEMBER, _CHOICE, _ElementCount)\ - {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {(StreamSerializeFcn_t)0}} + {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {NULL}, NULL} /****************************************************************************** * M_FIXED(Par1, Par2, Par3) @@ -538,7 +540,7 @@ * the message the unpacking procedure is aborted *****************************************************************************/ #define M_FIXED(_STRUCT, _BITS, _BITVALUE)\ - {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {(StreamSerializeFcn_t)0}} + {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {NULL}, NULL} /****************************************************************************** * M_SERIALIZE(Par1, Par2, Par3) @@ -551,10 +553,10 @@ * back control over the data stream and continues to work with the message. *****************************************************************************/ #define M_SERIALIZE(_STRUCT, _MEMBER, _LENGTH_LEN, _SERIALIZEFCN)\ - {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {_SERIALIZEFCN}} + {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, (void_fn_t)_SERIALIZEFCN} #define M_CALLBACK(_STRUCT, _CSNCALLBACKFCN, _PARAM1, _PARAM2)\ - {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {_CSNCALLBACKFCN}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {(StreamSerializeFcn_t)0}} + {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {NULL}, (void_fn_t)_CSNCALLBACKFCN} /****************************************************************************** * M_BITMAP(Par1, Par2, Par3) @@ -565,42 +567,42 @@ * Par3: length of the bitmap expressed in bits *****************************************************************************/ #define M_BITMAP(_STRUCT, _MEMBER, _BITS)\ - {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, right aligned bitmap i.e. _ElementCountField = 11 => 00000111 11111111 */ #define M_VAR_BITMAP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, right aligned bitmap filling the rest of message * - when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_VAR_BITMAP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, left aligned bitmap i.e. _ElementCountField = 11 => 11111111 11100000 */ #define M_LEFT_VAR_BMP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* variable length, left aligned bitmap filling the rest of message *- when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_LEFT_VAR_BMP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /* todo: dissect padding bits looking for unexpected extensions */ #define M_PADDING_BITS(_STRUCT)\ - {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {(StreamSerializeFcn_t)0}} + {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {NULL}, NULL} #define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ - {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(StreamSerializeFcn_t)0}} + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} #define M_THIS_EXIST(_STRUCT)\ - {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} + {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} #define M_THIS_EXIST_LH(_STRUCT)\ - {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {(StreamSerializeFcn_t)0}} + {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} /* return value 0 if ok else discontionue the unpacking */ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia1a8c50c4b024ca6df4e3fbbf891cd33591ccc9b Gerrit-Change-Number: 16999 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:43 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix an infinite loop in CSN.1 dissector when having more than 2... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17000 ) Change subject: csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits ...................................................................... csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits Port of wireshark.git 8b5aa913711b32b1e1bc707919d2a98c1875d443. Ported-by: Pau Espin Pedrol Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 --- M src/csn1.cpp M src/csn1.h 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 493d471..21bb976 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1150,7 +1150,7 @@ { while (remaining_bits_len > 0) { - guint8 bits_to_handle = remaining_bits_len%8; + guint bits_to_handle = remaining_bits_len%8; if (bits_to_handle > 0) { LOGPC(DCSN1, LOGL_NOTICE, "%" PRIu64 "|", bitvec_read_field(vector, &readIndex, bits_to_handle)); diff --git a/src/csn1.h b/src/csn1.h index c5ee919..0da529c 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -56,6 +56,7 @@ typedef signed int gint32; typedef signed short gint16; typedef int gint; +typedef unsigned int guint; typedef gint gboolean; typedef unsigned char guint8; typedef unsigned short guint16; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f6aecc2c0f300c1a77cd683652969d3f1aa5794 Gerrit-Change-Number: 17000 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:44 +0000 Subject: Change in osmo-pcu[master]: csn1: Fix warning with -Wmissing-prototypes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17001 ) Change subject: csn1: Fix warning with -Wmissing-prototypes ...................................................................... csn1: Fix warning with -Wmissing-prototypes Port of wireshark.git 2e52e2ac997ca58caabee3270b5a6c3f96159ff0. Ported-by: Pau Espin Pedrol Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 --- M src/csn1.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index 21bb976..c9c9aa1 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1762,7 +1762,7 @@ { //gint16 count = pDescr->i; guint8 i = 0; - CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; + const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; pui8 = pui8DATA(data, pDescr->offset); i = *pui8; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic69a75ce3f01cea326139f678b963110e895c356 Gerrit-Change-Number: 17001 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:45 +0000 Subject: Change in osmo-pcu[master]: csn1: Don't cast away constness In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17002 ) Change subject: csn1: Don't cast away constness ...................................................................... csn1: Don't cast away constness Port of wireshark.git commit 8e22ded7f8537e37e89ba558c83702d127443ae8. Ported-by: Pau Espin Pedrol Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 --- M src/csn1.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.h b/src/csn1.h index 0da529c..19b44ae 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -480,7 +480,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_UNION(Par1, Par2) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I100d5c43d8878e660035bf4a64718771f41a38a8 Gerrit-Change-Number: 17002 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:45 +0000 Subject: Change in osmo-pcu[master]: csn1: Try to fix cast discards '__attribute__((const))' qualifier fro... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17003 ) Change subject: csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type ...................................................................... csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type Port of wireshark.git 1ff6213c949b373bcb7de5c48a5a4f805093066f. Ported-by: Pau Espin Pedrol Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 --- M src/csn1.h 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.h b/src/csn1.h index 19b44ae..bf910bd 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -405,14 +405,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -430,7 +430,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -441,7 +441,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -453,7 +453,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -461,7 +461,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -469,7 +469,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie14c335a904a17333e98ef58bf5e40245444e956 Gerrit-Change-Number: 17003 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:34:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:34:46 +0000 Subject: Change in osmo-pcu[master]: csn1: Drop format_p union from CSN_DESCR In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17004 ) Change subject: csn1: Drop format_p union from CSN_DESCR ...................................................................... csn1: Drop format_p union from CSN_DESCR Port of wireshark.git 8626bb4cbb4d9926f7b56663585d9ef66252f93f. We don't really need the other fields added there, let's keep only the value out of the union. Change-Id: Ia8889252ee7518a919a15d749815c2803b4b23cd --- M src/csn1.cpp M src/csn1.h 2 files changed, 51 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index c9c9aa1..bf4d6c5 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -335,7 +335,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -382,7 +382,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -762,7 +762,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -821,7 +821,7 @@ gint16 Status; csnStream_t arT = *ar; guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->format_p.value; + guint16 nSize = (guint16)(guint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); @@ -1264,7 +1264,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); @@ -1327,7 +1327,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; csnStream_t arT = *ar; gboolean EndOfList = FALSE; @@ -1608,7 +1608,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -1655,7 +1655,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2025,7 +2025,7 @@ guint8 no_of_bits = (guint8) pDescr->i; guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - if (pDescr->format_p.value != 0) + if (pDescr->value != 0) { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ nCount = *pui16DATA(data, nCount); } @@ -2072,7 +2072,7 @@ gint16 Status; csnStream_t arT = *ar; gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->format_p.value; + guint16 nSize = (guint16)(gint32)pDescr->value; pui8 = pui8DATA(data, pDescr->offset); if (pDescr->type == CSN_VARIABLE_TARRAY) @@ -2517,7 +2517,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; pui8 = pui8DATA(data, pDescr->offset); /* Store the counted number of elements of the array */ @@ -2579,7 +2579,7 @@ * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} */ - gint16 nSizeElement = (gint16)(gint32)pDescr->format_p.value; + gint16 nSizeElement = (gint16)(gint32)pDescr->value; guint8 ElementCount = 0; guint8 ElementNum = 0; csnStream_t arT = *ar; diff --git a/src/csn1.h b/src/csn1.h index bf910bd..f445dd2 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -202,12 +202,7 @@ unsigned offset; gboolean may_be_null; const char* sz; - union - { - void * dummy; /* to eliminate --pedantic compiler warnings */ - guint32 value; - int* hf_ptr; - } format_p; + guint32 value; void_fn_t aux_fn; } CSN_DESCR; @@ -247,7 +242,7 @@ CSN_DESCR CSNDESCR_##_STRUCT[] = { #define CSN_DESCR_END(_STRUCT)\ - {CSN_END, 0, {0}, 0, FALSE, "", {NULL}, NULL} }; + {CSN_END, 0, {0}, 0, FALSE, "", 0, NULL} }; /****************************************************************************** * CSN_ERROR(Par1, Par2, Par3) @@ -258,7 +253,7 @@ * Par3: Error code *****************************************************************************/ #define CSN_ERROR(_STRUCT, _Text, _ERRCODE)\ - {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, {NULL}, NULL} + {CSN_TRAP_ERROR, _ERRCODE, {_Text}, 0, FALSE, _Text, 0, NULL} /****************************************************************************** * M_BIT(Par1, Par2) @@ -267,7 +262,7 @@ * Par2: C structure element name *****************************************************************************/ #define M_BIT(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_BIT_OR_NULL(Par1, Par2) @@ -277,7 +272,7 @@ * Covers the case {null | 0 | 1} *****************************************************************************/ #define M_BIT_OR_NULL(_STRUCT, _MEMBER)\ - {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_BIT, 0, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST(Par1, Par2, Par3) @@ -289,7 +284,7 @@ * element(s) does not exist *****************************************************************************/ #define M_NEXT_EXIST(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_LH(Par1, Par2, Par3) @@ -299,7 +294,7 @@ * pattern 0x2B is performed on the read bit before the decision is made. *****************************************************************************/ #define M_NEXT_EXIST_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL(Par1, Par2, Par3) @@ -309,7 +304,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST, _NoOfExisting, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_NEXT_EXIST_OR_NULL_LH(Par1, Par2, Par3) @@ -319,7 +314,7 @@ * Covers the case {null | L | H < IE >} *****************************************************************************/ #define M_NEXT_EXIST_OR_NULL_LH(_STRUCT, _MEMBER, _NoOfExisting)\ - {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_NEXT_EXIST_LH, _NoOfExisting, {(void*)1}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -329,7 +324,7 @@ * Par3: number of bits used to code the element (between 1 and 32) *****************************************************************************/ #define M_UINT(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_OR_NULL(Par1, Par2, Par3) @@ -339,7 +334,7 @@ * Covers the case {null | 0 | 1 < IE >} *****************************************************************************/ #define M_UINT_OR_NULL(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, {NULL}, NULL} + {CSN_UINT, _BITS, {0}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT(Par1, Par2, Par3) @@ -349,7 +344,7 @@ * received CSN.1 message *****************************************************************************/ #define M_UINT_LH(_STRUCT, _MEMBER, _BITS)\ - {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_LH, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_OFFSET(Par1, Par2, Par3, Par4) @@ -360,7 +355,7 @@ * Par4: value added to the returned integer (offset) *****************************************************************************/ #define M_UINT_OFFSET(_STRUCT, _MEMBER, _BITS, _OFFSET)\ - {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_OFFSET, _BITS, {(void*)_OFFSET}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -371,7 +366,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCount)\ - {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_UINT_ARRAY, _BITS, {(void*)_ElementCount}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_UINT_ARRAY(Par1, Par2, Par3, Par4) @@ -383,7 +378,7 @@ * structure member holding the length value *****************************************************************************/ #define M_VAR_UINT_ARRAY(_STRUCT, _MEMBER, _BITS, _ElementCountField)\ - {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)1}, NULL} + {CSN_UINT_ARRAY, _BITS, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 1, NULL} /****************************************************************************** * M_VAR_ARRAY(Par1, Par2, Par3, Par4) @@ -394,7 +389,7 @@ * Par4: offset that is added to the Par3 to get the actual size of the array *****************************************************************************/ #define M_VAR_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_ARRAY, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_TARRAY(Par1, Par2, Par3, Par4) @@ -405,14 +400,14 @@ * Par4: name of the structure member holding the size of the array *****************************************************************************/ #define M_VAR_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_VAR_TARRAY_OFFSET(Par1, Par2, Par3, Par4) * Same as M_VAR_TARRAY with offset *****************************************************************************/ #define M_VAR_TARRAY_OFFSET(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_VARIABLE_TARRAY_OFFSET, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_ARRAY(Par1, Par2, Par3, Par4) @@ -430,7 +425,7 @@ * Par4: length of each element in bits *****************************************************************************/ #define M_REC_ARRAY(_STRUCT, _MEMBER, _ElementCountField, _BITS)\ - {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_RECURSIVE_ARRAY, _BITS, {(const void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_VAR_TYPE_ARRAY(Par1, Par2, Par3, Par4) @@ -441,7 +436,7 @@ * Par4: number of elements in the array (fixed integer value) *****************************************************************************/ #define M_TYPE_ARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCount)\ - {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_TYPE_ARRAY, _ElementCount, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY(Par1, Par2, Par3, Par4) @@ -453,7 +448,7 @@ * Par4: will hold the number of element in the array after unpacking *****************************************************************************/ #define M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY1(Par1, Par2, Par3, Par4) @@ -461,7 +456,7 @@ * ::= {1 } ** 0 ; *****************************************************************************/ #define M_REC_TARRAY_1(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_1, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_REC_TARRAY2(Par1, Par2, Par3, Par4) @@ -469,7 +464,7 @@ * ::= { 0 } ** 1 ; *****************************************************************************/ #define M_REC_TARRAY_2(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField)\ - {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {(void *)sizeof(_MEMBER_TYPE)}, NULL} + {CSN_RECURSIVE_TARRAY_2, offsetof(_STRUCT, _ElementCountField), {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, sizeof(_MEMBER_TYPE), NULL} /****************************************************************************** * M_TYPE(Par1, Par2, Par3) @@ -480,7 +475,7 @@ * Par3: type of member *****************************************************************************/ #define M_TYPE(_STRUCT, _MEMBER, _MEMBER_TYPE)\ - {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** * M_UNION(Par1, Par2) @@ -493,14 +488,14 @@ * Par2: number of possible choice in the union *****************************************************************************/ #define M_UNION(_STRUCT, _COUNT)\ - {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} + {CSN_UNION, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", 0, NULL} /****************************************************************************** * M_UNION_LH(Par1, Par2) * Same as M_UNION but masked with background value 0x2B *****************************************************************************/ #define M_UNION_LH(_STRUCT, _COUNT)\ - {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", {NULL}, NULL} + {CSN_UNION_LH, _COUNT, {0}, offsetof(_STRUCT, UnionType), FALSE, "UnionType", 0, NULL} /****************************************************************************** * M_CHOICE(Par1, Par2, Par3, Par4) @@ -529,7 +524,7 @@ * Par4: number of possible choices in the union *****************************************************************************/ #define M_CHOICE(_STRUCT, _MEMBER, _CHOICE, _ElementCount)\ - {CSN_CHOICE, _ElementCount, {(void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, {NULL}, NULL} + {CSN_CHOICE, _ElementCount, {(const void*)_CHOICE}, offsetof(_STRUCT, _MEMBER), FALSE, #_CHOICE, 0, NULL} /****************************************************************************** * M_FIXED(Par1, Par2, Par3) @@ -541,7 +536,7 @@ * the message the unpacking procedure is aborted *****************************************************************************/ #define M_FIXED(_STRUCT, _BITS, _BITVALUE)\ - {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, {NULL}, NULL} + {CSN_FIXED, _BITS, {0}, _BITVALUE, FALSE, #_BITVALUE, 0, NULL} /****************************************************************************** * M_SERIALIZE(Par1, Par2, Par3) @@ -554,10 +549,10 @@ * back control over the data stream and continues to work with the message. *****************************************************************************/ #define M_SERIALIZE(_STRUCT, _MEMBER, _LENGTH_LEN, _SERIALIZEFCN)\ - {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, (void_fn_t)_SERIALIZEFCN} + {CSN_SERIALIZE, _LENGTH_LEN, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, (void_fn_t)_SERIALIZEFCN} #define M_CALLBACK(_STRUCT, _CSNCALLBACKFCN, _PARAM1, _PARAM2)\ - {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, {NULL}, (void_fn_t)_CSNCALLBACKFCN} + {CSN_CALLBACK, offsetof(_STRUCT, _PARAM1), {0}, offsetof(_STRUCT, _PARAM2), FALSE, "CallBack_"#_CSNCALLBACKFCN, 0, (void_fn_t)_CSNCALLBACKFCN} /****************************************************************************** * M_BITMAP(Par1, Par2, Par3) @@ -568,42 +563,42 @@ * Par3: length of the bitmap expressed in bits *****************************************************************************/ #define M_BITMAP(_STRUCT, _MEMBER, _BITS)\ - {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_BITMAP, _BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, right aligned bitmap i.e. _ElementCountField = 11 => 00000111 11111111 */ #define M_VAR_BITMAP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_BITMAP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, right aligned bitmap filling the rest of message * - when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_VAR_BITMAP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_VARIABLE_BITMAP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, left aligned bitmap i.e. _ElementCountField = 11 => 11111111 11100000 */ #define M_LEFT_VAR_BMP(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* variable length, left aligned bitmap filling the rest of message *- when unpacking the _ElementCountField will be set in runtime * - when packing _ElementCountField contains the size of bitmap */ #define M_LEFT_VAR_BMP_1(_STRUCT, _MEMBER, _ElementCountField, _OFFSET)\ - {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_LEFT_ALIGNED_VAR_BMP_1, _OFFSET, {(void*)offsetof(_STRUCT, _ElementCountField)}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /* todo: dissect padding bits looking for unexpected extensions */ #define M_PADDING_BITS(_STRUCT)\ - {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", {NULL}, NULL} + {CSN_PADDING_BITS, 0, {0}, 0, TRUE, "Padding", 0, NULL} #define M_NULL(_STRUCT, _MEMBER, _SKIP_BITS)\ - {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, {NULL}, NULL} + {CSN_NULL, _SKIP_BITS, {0}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} #define M_THIS_EXIST(_STRUCT)\ - {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} + {CSN_EXIST, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", 0, NULL} #define M_THIS_EXIST_LH(_STRUCT)\ - {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", {NULL}, NULL} + {CSN_EXIST_LH, 0, {0}, offsetof(_STRUCT, Exist), FALSE, "Exist", 0, NULL} /* return value 0 if ok else discontionue the unpacking */ typedef gint16 (*CsnCallBackFcn_t)(void* pv ,...); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8889252ee7518a919a15d749815c2803b4b23cd Gerrit-Change-Number: 17004 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:35:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:35:26 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:35:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:35:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:35:39 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: #if 0 unused stuff In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17041 ) Change subject: gsm_rlcmac.h: #if 0 unused stuff ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2e80664d293a2a95372213b4164c3e72259e0bb Gerrit-Change-Number: 17041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:35:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:36:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:36:29 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacD... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17042 ) Change subject: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a Gerrit-Change-Number: 17042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:36:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:36:50 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17043 ) Change subject: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 Gerrit-Change-Number: 17043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:36:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:37:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:37:19 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: Enhance dissection of PSI1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17044 ) Change subject: gsm_rlcmac: Enhance dissection of PSI1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 Gerrit-Change-Number: 17044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:37:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:37:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:37:27 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17045 ) Change subject: gsm_rlcmac.cpp: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3b50cf386d417ba73b97f48b3000f69d9a54c8c9 Gerrit-Change-Number: 17045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:37:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:37:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:37:36 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17046 ) Change subject: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea Gerrit-Change-Number: 17046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:37:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:37:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:37:51 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17047 ) Change subject: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib9b8eafd69d3b45b0d631ba9635689807b472b73 Gerrit-Change-Number: 17047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:37:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:29 +0000 Subject: Change in osmo-pcu[master]: csn1: fix this statement may fall through [-Werror=implicit-fallthrou... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17005 ) Change subject: csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 ...................................................................... csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 Port of wireshark.git commit fd68c7dfc7d06ce7babe914f2575d9e4f35988ad. Ported-by: Pau Espin Pedrol Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd --- M src/csn1.cpp 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/csn1.cpp b/src/csn1.cpp index bf4d6c5..f248b95 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -1042,7 +1042,7 @@ /*no break - * with a length set we have a regular variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_VARIABLE_BITMAP: { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -1098,7 +1098,7 @@ * with a length set we have a regular left aligned variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_LEFT_ALIGNED_VAR_BMP: { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -1321,7 +1321,7 @@ * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue */ } - + /* FALL THROUGH */ case CSN_RECURSIVE_TARRAY_1: { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) @@ -2287,7 +2287,7 @@ /*no break - * with a length set we have a regular variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_VARIABLE_BITMAP: { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -2344,7 +2344,7 @@ * with a length set we have a regular left aligned variable length bitmap so we continue */ } - + /* FALL THROUGH */ case CSN_LEFT_ALIGNED_VAR_BMP: { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} * @@ -2573,7 +2573,7 @@ * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue */ } - + /* FALL THROUGH */ case CSN_RECURSIVE_TARRAY_1: { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibaf47d7c4fdff326ac1dccf6fff77e2357e6a2bd Gerrit-Change-Number: 17005 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:29 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: #if 0 unused stuff In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17041 ) Change subject: gsm_rlcmac.h: #if 0 unused stuff ...................................................................... gsm_rlcmac.h: #if 0 unused stuff Port of wireshark.git 2ef0c615946cd290aa9463c637169da0a1ca7972. Ported-by: Pau Espin Pedrol Change-Id: Ia2e80664d293a2a95372213b4164c3e72259e0bb --- M src/gsm_rlcmac.h 1 file changed, 107 insertions(+), 86 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 0ac1207..6c82669 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -216,7 +216,7 @@ typedef struct { guint8 TMSI[TMSI_LEN]; -}TMSI_t; +} TMSI_t; typedef guint16 CellId_t; @@ -355,6 +355,7 @@ } Id; }; +#if 0 struct OV_MobileId /* Struct for optional mobile identity */ { unsigned char IEI; @@ -368,7 +369,7 @@ LAI_PRIORITY_AVAILABLE, LAI_PRIORITY_FORBIDDEN, LAI_PRIORITY_FORCED -}LAI_Priority_t; +} LAI_Priority_t; typedef enum { @@ -378,33 +379,34 @@ NOM_GSM, NOM_PS_ONLY, NOM_UNKNOWN -}NMO_t; +} NMO_t; typedef enum { COMBINED, NOT_COMBINED, SAME_AS_BEFORE -}ProcedureMode_t; +} ProcedureMode_t; typedef struct { guint8 Cause; LAI_t LAI; struct OV_MobileId MobileId; -}CombinedResult_t; +} CombinedResult_t; typedef enum { R97, R99 -}MSCR_t, SGSNR_t; +} MSCR_t, SGSNR_t; typedef struct { guint8 NbrOfElements; PLMN_t Element[MAX_ELEMENTS_IN_EQPLMN_LIST]; -}EqPLMN_List_t; +} EqPLMN_List_t; +#endif #define MAX_PCCCH 16 #define MAX_RFL_LENGTH 16 /* length of RFL in PSI2 */ @@ -485,11 +487,13 @@ /* * */ +#if 0 #define SF_VBS 0 /* VBS (broadcast call reference) */ #define SF_VGCS 1 /* VGCS (group call reference) */ #define AF_AckIsNotRequired 0 /* acknowledgement is not required */ #define AF_AckIsRequired 1 /* acknowledgement is required */ +#endif typedef struct { @@ -821,6 +825,7 @@ } u; } IA_PacketAssignment_t; +#if 0 typedef struct { guint8 UnionType; @@ -855,7 +860,7 @@ { ExtendedRA_Info_Array_t ExtendedRA_Info; } IAR_t; - +#endif /* Packet Polling Request */ typedef struct @@ -886,6 +891,7 @@ guint8 Extension_Info[MAX_EXTENSION_LENGTH_IN_BYTES];/* ( val (extension length)+1 ) 04.60/12.26 */ } Extension_Bits_t; +#if 0 typedef struct { guint8 DTM_SUPPORT : 1; @@ -935,7 +941,7 @@ GPRS_ExtensionInfoWithEGPRS_t GPRS_ExtensionInfoWithEGPRS; GPRS_ExtensionInfoWithoutEGPRS_t GPRS_ExtensionInfoWithoutEGPRS; NonGPRS_ExtensionInfo_t NonGPRS_ExtensionInfo; - guint8 Extension_Information[MAX_EXTENSION_LENGTH_IN_BYTES]; + guint8 Extension_Information[MAX_EXTENSION_LENGTH_IN_BYTES]; } u; } Optional_Extension_Information_t; @@ -945,7 +951,7 @@ guint8 BEP_PERIOD; gboolean EGPRS_PACKET_CHANNEL_REQUEST; } EGPRS_OptionalExtensionInformation_t; - +#endif typedef struct { @@ -1010,14 +1016,16 @@ /* < Packet TBF Release message content > */ typedef guint8 TBF_RELEASE_CAUSE_t; +#if 0 #define TBF_RELEASE_CAUSE_NORMAL (0x00) #define TBF_RELEASE_CAUSE_ABNORMAL (0x02) +#endif typedef struct { guint8 MESSAGE_TYPE; guint8 PAGE_MODE; - Global_TFI_t Global_TFI; + Global_TFI_t Global_TFI; guint8 UPLINK_RELEASE; guint8 DOWNLINK_RELEASE; TBF_RELEASE_CAUSE_t TBF_RELEASE_CAUSE; @@ -1055,10 +1063,12 @@ typedef Packet_Control_Acknowledgement_t Packet_Ctrl_Ack_t; +#if 0 typedef struct { guint8 CTRL_ACK; } Packet_Control_Acknowledgement_11_bit_t, Packet_Control_Acknowledgement_8_bit_t; +#endif /* < Packet Downlink Dummy Control Block message content > */ typedef struct @@ -1201,11 +1211,13 @@ AccTech_GSMOther = 0xf } AccessTechnology_t; +#if 0 typedef struct { guint8 CountAccessTechnologies; AccessTechnology_t AccessTechnologies[MAX_ACCESS_TECHNOLOGIES_COUNT]; } AccessTechnologiesRequest_t; +#endif typedef struct { @@ -1567,14 +1579,14 @@ guint8 Exist_Measurement_Bandwidth; guint8 Measurement_Bandwidth; guint16 Physical_Layer_Cell_Identity; -}EUTRAN_Target_Cell_t; +} EUTRAN_Target_Cell_t; typedef struct { guint32 UTRAN_CI; guint8 Exist_PLMN_ID; PLMN_t PLMN_ID; -}UTRAN_CSG_Target_Cell_t; +} UTRAN_CSG_Target_Cell_t; typedef struct { @@ -1582,7 +1594,7 @@ guint16 Tracking_Area_Code; guint8 Exist_PLMN_ID; PLMN_t PLMN_ID; -}EUTRAN_CSG_Target_Cell_t; +} EUTRAN_CSG_Target_Cell_t; typedef struct { @@ -1590,7 +1602,7 @@ UTRAN_CSG_Target_Cell_t UTRAN_CSG_Target_Cell; guint8 Exist_EUTRAN_CSG_Target_Cell; EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; -}PCCF_AdditionsR9_t; +} PCCF_AdditionsR9_t; typedef struct { @@ -1598,7 +1610,7 @@ EUTRAN_Target_Cell_t EUTRAN_Target_Cell; guint8 Exist_AdditionsR9; PCCF_AdditionsR9_t AdditionsR9; -}PCCF_AdditionsR8_t; +} PCCF_AdditionsR8_t; typedef struct { @@ -1767,11 +1779,13 @@ } u; } PU_AckNack_EGPRS_t; +#if 0 enum PUAN_Type { PUAN_GPRS, PUAN_EGPRS }; +#endif typedef struct { @@ -2048,11 +2062,13 @@ } u; } PUA_EGPRS_t; +#if 0 enum PUA_Type { PUA_GPRS, PUA_EGPRS }; +#endif typedef struct { @@ -2098,7 +2114,7 @@ typedef struct { DTM_Packet_Uplink_Assignment_t DTM_Packet_Uplink_Assignment; -}DTM_UL_t; +} DTM_UL_t; /* < DTM Packet Channel Request message content > */ typedef struct @@ -2107,7 +2123,7 @@ Channel_Request_Description_t Channel_Request_Description; gboolean Exist_PFI; guint8 PFI; -}DTM_Channel_Request_Description_t; +} DTM_Channel_Request_Description_t; /* < Packet Downlink Assignment message content > */ typedef struct @@ -2213,18 +2229,18 @@ typedef struct { DTM_Packet_Downlink_Assignment_t DTM_Packet_Downlink_Assignment; -}DTM_DL_t; +} DTM_DL_t; typedef struct { GPRS_Cell_Options_t GPRS_Cell_Options; GPRS_Power_Control_Parameters_t GPRS_Power_Control_Parameters; -}DTM_GPRS_Broadcast_Information_t; +} DTM_GPRS_Broadcast_Information_t; typedef struct { DTM_GPRS_Broadcast_Information_t DTM_GPRS_Broadcast_Information; -}DTM_GPRS_B_t; +} DTM_GPRS_B_t; /* < Packet Paging Request message content > */ typedef struct @@ -2275,7 +2291,7 @@ guint8 Count_Repeated_Page_info; Repeated_Page_info_t Repeated_Page_info[5]; -} Packet_Paging_Request_t; +} Packet_Paging_Request_t; typedef struct { @@ -2430,11 +2446,13 @@ } u; } PTR_EGPRS_t; +#if 0 enum PTR_Type { PTR_GPRS, PTR_EGPRS }; +#endif typedef struct { @@ -2739,14 +2757,14 @@ guint8 TIME_GROUP; guint8 Exist_GUAR_CONSTANT_PWR_BLKS; guint8 GUAR_CONSTANT_PWR_BLKS; -}COMPACT_Cell_Sel_t; +} COMPACT_Cell_Sel_t; typedef struct { guint8 FREQ_DIFF_LENGTH; guint16 FREQUENCY_DIFF; COMPACT_Cell_Sel_t COMPACT_Cell_Sel_Remain_Cells; -}COMPACT_Neighbour_Cell_Param_Remaining_t; +} COMPACT_Neighbour_Cell_Param_Remaining_t; typedef struct { @@ -2755,20 +2773,20 @@ guint8 NR_OF_REMAINING_CELLS; guint8 FREQ_DIFF_LENGTH; COMPACT_Neighbour_Cell_Param_Remaining_t COMPACT_Neighbour_Cell_Param_Remaining[16]; -}COMPACT_Neighbour_Cell_Param_t; +} COMPACT_Neighbour_Cell_Param_t; typedef struct { Cell_Identification_t Cell_Identification; guint8 COMPACT_Neighbour_Cell_Param_Count; COMPACT_Neighbour_Cell_Param_t COMPACT_Neighbour_Cell_Param[8]; -}COMPACT_Info_t; +} COMPACT_Info_t; typedef struct { guint8 Exist_CCN_Support_Desc; CCN_Support_Description_t CCN_Support_Desc; -}PSI3_AdditionR4_t; +} PSI3_AdditionR4_t; typedef struct { @@ -2776,7 +2794,7 @@ COMPACT_Info_t COMPACT_Info; guint8 Exist_AdditionR4; PSI3_AdditionR4_t AdditionR4; -}PSI3_AdditionR99_t; +} PSI3_AdditionR99_t; typedef struct { @@ -2785,7 +2803,7 @@ LSA_Parameters_t LSA_Parameters; guint8 Exist_AdditionR99; PSI3_AdditionR99_t AdditionR99; -}PSI3_AdditionR98_t; +} PSI3_AdditionR98_t; typedef struct { @@ -2884,7 +2902,7 @@ guint8 INVALID_BSIC_REPORTING; guint8 Exist_NCC_PERMITTED; guint8 NCC_PERMITTED; - + gboolean Exist_GPRSMeasurementParams; MeasurementParams_t GPRSMeasurementParams; gboolean Exist_GPRSMeasurementParams3G; @@ -2897,7 +2915,7 @@ OffsetThreshold_t OffsetThreshold_700; guint8 Exist_OffsetThreshold_810; OffsetThreshold_t OffsetThreshold_810; -}PSI5_AdditionsR7; +} PSI5_AdditionsR7; typedef struct { @@ -2905,7 +2923,7 @@ GPRS_AdditionalMeasurementParams3G_t GPRS_AdditionalMeasurementParams3G; guint8 Exist_AdditionsR7; PSI5_AdditionsR7 AdditionsR7; -}PSI5_AdditionsR5; +} PSI5_AdditionsR5; typedef struct { @@ -2913,7 +2931,7 @@ ENH_Reporting_Parameters_t ENH_Reporting_Param; guint8 Exist_AdditionsR5; PSI5_AdditionsR5 AdditionisR5; -}PSI5_AdditionsR99; +} PSI5_AdditionsR99; typedef struct { @@ -3197,7 +3215,7 @@ guint32 CSG_ID; gboolean Access_Mode; guint8 REPORTING_QUANTITY; -}UTRAN_CSG_Measurement_Report_t; +} UTRAN_CSG_Measurement_Report_t; typedef struct { @@ -3208,7 +3226,7 @@ guint32 CSG_ID; gboolean Access_Mode; guint8 REPORTING_QUANTITY; -}EUTRAN_CSG_Measurement_Report_t; +} EUTRAN_CSG_Measurement_Report_t; typedef struct { @@ -3216,20 +3234,20 @@ UTRAN_CSG_Measurement_Report_t UTRAN_CSG_Meas_Rpt; gboolean Exist_EUTRAN_CSG_Meas_Rpt; EUTRAN_CSG_Measurement_Report_t EUTRAN_CSG_Meas_Rpt; -}PMR_AdditionsR9_t; +} PMR_AdditionsR9_t; typedef struct { guint8 EUTRAN_FREQUENCY_INDEX; guint16 CELL_IDENTITY; guint8 REPORTING_QUANTITY; -}EUTRAN_Measurement_Report_Body_t; +} EUTRAN_Measurement_Report_Body_t; typedef struct { guint8 N_EUTRAN; EUTRAN_Measurement_Report_Body_t Report[4]; -}EUTRAN_Measurement_Report_t; +} EUTRAN_Measurement_Report_t; typedef struct { @@ -3237,7 +3255,7 @@ EUTRAN_Measurement_Report_t EUTRAN_Meas_Rpt; gboolean Exist_AdditionsR9; PMR_AdditionsR9_t AdditionsR9; -}PMR_AdditionsR8_t; +} PMR_AdditionsR8_t; typedef struct { @@ -3245,7 +3263,7 @@ guint8 GRNTI; gboolean Exist_AdditionsR8; PMR_AdditionsR8_t AdditionsR8; -}PMR_AdditionsR5_t; +} PMR_AdditionsR5_t; typedef struct { @@ -3327,14 +3345,14 @@ guint8 Exist_UTRAN_CSG_Target_Cell; UTRAN_CSG_Target_Cell_t UTRAN_CSG_Target_Cell; guint8 Exist_EUTRAN_CSG_Target_Cell; - EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; -}PEMR_AdditionsR9_t; + EUTRAN_CSG_Target_Cell_t EUTRAN_CSG_Target_Cell; +} PEMR_AdditionsR9_t; typedef struct { gboolean Exist_REPORTING_QUANTITY; guint8 REPORTING_QUANTITY; -}Bitmap_Report_Quantity_t; +} Bitmap_Report_Quantity_t; typedef struct { @@ -3344,7 +3362,7 @@ EUTRAN_Measurement_Report_t EUTRAN_Meas_Rpt; gboolean Exist_AdditionsR9; PEMR_AdditionsR9_t AdditionsR9; -}PEMR_AdditionsR8_t; +} PEMR_AdditionsR8_t; typedef struct { @@ -3352,7 +3370,7 @@ guint8 GRNTI_Ext; gboolean Exist_AdditionsR8; PEMR_AdditionsR8_t AdditionsR8; -}PEMR_AdditionsR5_t; +} PEMR_AdditionsR5_t; typedef struct { @@ -3400,7 +3418,7 @@ guint8 BANDWITH_TDD; guint8 CELL_PARAMETER; guint8 Sync_Case_TSTD; -}TDD_Target_Cell_Notif_t; +} TDD_Target_Cell_Notif_t; typedef struct { @@ -3418,21 +3436,21 @@ guint8 Measurement_Bandwidth; guint16 Physical_Layer_Cell_Identity; guint8 Reporting_Quantity; -}Target_EUTRAN_Cell_Notif_t; +} Target_EUTRAN_Cell_Notif_t; typedef struct { guint8 EUTRAN_FREQUENCY_INDEX; guint16 CELL_IDENTITY; guint8 REPORTING_QUANTITY; -}Eutran_Ccn_Measurement_Report_Cell_t; +} Eutran_Ccn_Measurement_Report_Cell_t; typedef struct { gboolean ThreeG_BA_USED; guint8 N_EUTRAN; Eutran_Ccn_Measurement_Report_Cell_t Eutran_Ccn_Measurement_Report_Cell[4]; -}Eutran_Ccn_Measurement_Report_t; +} Eutran_Ccn_Measurement_Report_t; typedef struct { @@ -3445,7 +3463,7 @@ Target_EUTRAN_Cell_Notif_t Target_EUTRAN_Cell; guint8 Exist_Eutran_Ccn_Measurement_Report; Eutran_Ccn_Measurement_Report_t Eutran_Ccn_Measurement_Report; -}Target_Cell_4G_Notif_t; +} Target_Cell_4G_Notif_t; typedef struct { @@ -3457,7 +3475,7 @@ } u; guint8 Exist_Eutran_Ccn_Measurement_Report; Eutran_Ccn_Measurement_Report_t Eutran_Ccn_Measurement_Report; -}Target_Cell_CSG_Notif_t; +} Target_Cell_CSG_Notif_t; typedef struct { @@ -3467,7 +3485,7 @@ Target_Cell_4G_Notif_t Target_Cell_4G_Notif; Target_Cell_CSG_Notif_t Target_Cell_CSG_Notif; } u; -}Target_Other_RAT_2_Notif_t; +} Target_Other_RAT_2_Notif_t; typedef struct { @@ -3477,8 +3495,8 @@ Target_Cell_3G_Notif_t Target_Cell_3G_Notif; Target_Other_RAT_2_Notif_t Target_Other_RAT_2_Notif; } u; - -}Target_Other_RAT_Notif_t; + +} Target_Other_RAT_Notif_t; typedef struct { @@ -4036,7 +4054,7 @@ guint8 PSC_Pattern_length; guint8 PSC_Pattern; gboolean PSC_Pattern_sense; -}PSC_Pattern_t; +} PSC_Pattern_t; typedef struct { @@ -4044,33 +4062,33 @@ guint16 PSC[32]; guint8 PSC_Pattern_Count; PSC_Pattern_t PSC_Pattern[32]; -}PSC_Group_t; +} PSC_Group_t; typedef struct { PSC_Group_t CSG_PSC_SPLIT; guint8 Count; guint8 UTRAN_FREQUENCY_INDEX[32]; -}ThreeG_CSG_Description_Body_t; +} ThreeG_CSG_Description_Body_t; typedef struct { guint8 Count; ThreeG_CSG_Description_Body_t ThreeG_CSG_Description_Body[32]; -}ThreeG_CSG_Description_t; +} ThreeG_CSG_Description_t; typedef struct { PSC_Group_t CSG_PCI_SPLIT; guint8 Count; guint8 EUTRAN_FREQUENCY_INDEX[32]; -}EUTRAN_CSG_Description_Body_t; +} EUTRAN_CSG_Description_Body_t; typedef struct { guint8 Count; EUTRAN_CSG_Description_Body_t EUTRAN_CSG_Description_Body[32]; -}EUTRAN_CSG_Description_t; +} EUTRAN_CSG_Description_t; typedef struct { @@ -4079,13 +4097,13 @@ guint8 EUTRAN_FREQUENCY_INDEX_top; guint8 Count_EUTRAN_FREQUENCY_INDEX; guint8 EUTRAN_FREQUENCY_INDEX[32]; - + gboolean existMeasurement_Control_UTRAN; gboolean Measurement_Control_UTRAN; guint8 UTRAN_FREQUENCY_INDEX_top; guint8 Count_UTRAN_FREQUENCY_INDEX; guint8 UTRAN_FREQUENCY_INDEX[32]; -}Meas_Ctrl_Param_Desp_t; +} Meas_Ctrl_Param_Desp_t; typedef struct { @@ -4096,7 +4114,7 @@ guint8 EUTRAN_QQUALMIN; gboolean existEUTRAN_RSRPmin; guint8 EUTRAN_RSRPmin; -}Reselection_Based_On_RSRQ_t; +} Reselection_Based_On_RSRQ_t; typedef struct { @@ -4108,13 +4126,13 @@ guint8 EUTRAN_Qmin; Reselection_Based_On_RSRQ_t Reselection_Based_On_RSRQ; } u; -}Rept_EUTRAN_Enh_Cell_Resel_Param_t; +} Rept_EUTRAN_Enh_Cell_Resel_Param_t; typedef struct { guint8 Count; Rept_EUTRAN_Enh_Cell_Resel_Param_t Repeated_EUTRAN_Enhanced_Cell_Reselection_Parameters[32]; -}Enh_Cell_Reselect_Param_Desp_t; +} Enh_Cell_Reselect_Param_Desp_t; typedef struct { @@ -4123,7 +4141,7 @@ guint8 UTRAN_CSG_FDD_REPORTING_THRESHOLD_2; gboolean existUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 UTRAN_CSG_TDD_REPORTING_THRESHOLD; -}UTRAN_CSG_Cells_Reporting_Desp_t; +} UTRAN_CSG_Cells_Reporting_Desp_t; typedef struct { @@ -4133,7 +4151,7 @@ gboolean existEUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 EUTRAN_CSG_TDD_REPORTING_THRESHOLD; guint8 EUTRAN_CSG_TDD_REPORTING_THRESHOLD_2; -}EUTRAN_CSG_Cells_Reporting_Desp_t; +} EUTRAN_CSG_Cells_Reporting_Desp_t; typedef struct { @@ -4141,33 +4159,33 @@ UTRAN_CSG_Cells_Reporting_Desp_t UTRAN_CSG_Cells_Reporting_Description; gboolean existEUTRAN_CSG_Cells_Reporting_Description; EUTRAN_CSG_Cells_Reporting_Desp_t EUTRAN_CSG_Cells_Reporting_Description; -}CSG_Cells_Reporting_Desp_t; +} CSG_Cells_Reporting_Desp_t; typedef struct { gboolean existEnhanced_Cell_Reselection_Parameters_Description; Enh_Cell_Reselect_Param_Desp_t Enhanced_Cell_Reselection_Parameters_Description; - + gboolean existCSG_Cells_Reporting_Description; CSG_Cells_Reporting_Desp_t CSG_Cells_Reporting_Description; -}PMO_AdditionsR9_t; +} PMO_AdditionsR9_t; typedef struct { guint8 dummy; -}Delete_All_Stored_Individual_Priorities_t; +} Delete_All_Stored_Individual_Priorities_t; typedef struct { guint8 Count; guint16 FDD_ARFCN[32]; -}Individual_UTRAN_Priority_FDD_t; +} Individual_UTRAN_Priority_FDD_t; typedef struct { guint8 Count; guint16 TDD_ARFCN[32]; -}Individual_UTRAN_Priority_TDD_t; +} Individual_UTRAN_Priority_TDD_t; typedef struct { @@ -4178,7 +4196,7 @@ Individual_UTRAN_Priority_TDD_t Individual_UTRAN_Priority_TDD; } u; guint8 UTRAN_PRIORITY; -}Repeated_Individual_UTRAN_Priority_Parameters_t; +} Repeated_Individual_UTRAN_Priority_Parameters_t; typedef struct { @@ -4186,14 +4204,14 @@ guint8 DEFAULT_UTRAN_PRIORITY; guint8 Repeated_Individual_UTRAN_Priority_Parameters_Count; Repeated_Individual_UTRAN_Priority_Parameters_t Repeated_Individual_UTRAN_Priority_Parameters[32]; -}ThreeG_Individual_Priority_Parameters_Description_t; +} ThreeG_Individual_Priority_Parameters_Description_t; typedef struct { guint8 Count; guint16 EARFCN[32]; guint8 EUTRAN_PRIORITY; -}Repeated_Individual_EUTRAN_Priority_Parameters_t; +} Repeated_Individual_EUTRAN_Priority_Parameters_t; typedef struct { @@ -4201,7 +4219,7 @@ guint8 DEFAULT_EUTRAN_PRIORITY; guint8 Count; Repeated_Individual_EUTRAN_Priority_Parameters_t Repeated_Individual_EUTRAN_Priority_Parameters[32]; -}EUTRAN_Individual_Priority_Parameters_Description_t; +} EUTRAN_Individual_Priority_Parameters_Description_t; typedef struct { @@ -4212,7 +4230,7 @@ EUTRAN_Individual_Priority_Parameters_Description_t EUTRAN_Individual_Priority_Parameters_Description; guint8 Exist_T3230_timeout_value; guint8 T3230_timeout_value; -}Provide_Individual_Priorities_t; +} Provide_Individual_Priorities_t; typedef struct { @@ -4222,7 +4240,7 @@ Delete_All_Stored_Individual_Priorities_t Delete_All_Stored_Individual_Priorities; Provide_Individual_Priorities_t Provide_Individual_Priorities; } u; -}Individual_Priorities_t; +} Individual_Priorities_t; typedef struct { @@ -4375,7 +4393,7 @@ EUTRAN_Target_Cell_t EUTRAN_Target_Cell; guint8 Exist_Individual_Priorities; Individual_Priorities_t Individual_Priorities; -}Target_Cell_3G_AdditionsR8_t; +} Target_Cell_3G_AdditionsR8_t; typedef struct { @@ -4383,7 +4401,7 @@ guint8 G_RNTI_Extention; guint8 Exist_AdditionsR8; Target_Cell_3G_AdditionsR8_t AdditionsR8; -}Target_Cell_3G_AdditionsR5_t; +} Target_Cell_3G_AdditionsR5_t; typedef struct { @@ -4397,8 +4415,10 @@ Target_Cell_3G_AdditionsR5_t AdditionsR5; } Target_Cell_3G_t; +#if 0 #define TARGET_CELL_GSM 0 #define TARGET_CELL_3G 1 +#endif typedef struct { @@ -4661,7 +4681,7 @@ GlobalTimeslotDescription_UA_t GTD_UA; guint8 Exist_DownlinkTBF; DownlinkTBF_t DownlinkTBF; -}PHO_EGPRS_t; +} PHO_EGPRS_t; typedef struct { @@ -4944,7 +4964,7 @@ Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; + EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; Packet_Measurement_Report_t Packet_Measurement_Report; Packet_Resource_Request_t Packet_Resource_Request; @@ -4953,8 +4973,8 @@ Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; Packet_SI_Status_t Packet_SI_Status; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - Packet_Pause_t Packet_Pause; + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; + Packet_Pause_t Packet_Pause; } u; gint16 NrOfBits; } RlcMacUplink_t; @@ -5058,9 +5078,10 @@ guint8 SI13_POSITION; } SI4_Rest_Octet_t; +#if 0 typedef SI4_Rest_Octet_t SI7_Rest_Octet_t; typedef SI4_Rest_Octet_t SI8_Rest_Octet_t; - +#endif /* SI6_RestOctet_t */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2e80664d293a2a95372213b4164c3e72259e0bb Gerrit-Change-Number: 17041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:29 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacD... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17042 ) Change subject: gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call ...................................................................... gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call Port from wireshark.git commit 6c32ba5ff1a5f5ec2426d1d2c4f4f37fd136bab0. Ported-by: Pau Espin Pedrol Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a --- M src/gsm_rlcmac.h 1 file changed, 35 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 6c82669..196ced2 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -4900,35 +4900,45 @@ union { guint8 MESSAGE_TYPE; - - Packet_Access_Reject_t Packet_Access_Reject; - Packet_Cell_Change_Order_t Packet_Cell_Change_Order; - Packet_Downlink_Assignment_t Packet_Downlink_Assignment; - Packet_Measurement_Order_Reduced_t Packet_Measurement_Order; - Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; - Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; - Packet_Paging_Request_t Packet_Paging_Request; - Packet_PDCH_Release_t Packet_PDCH_Release; - Packet_Polling_Request_t Packet_Polling_Request; - Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; - Packet_PRACH_Parameters_t Packet_PRACH_Parameters; - Packet_Queueing_Notification_t Packet_Queueing_Notification; - Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; - Packet_TBF_Release_t Packet_TBF_Release; - Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; - Packet_Uplink_Assignment_t Packet_Uplink_Assignment; - Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; - Packet_Handover_Command_t Packet_Handover_Command; - Packet_PhysicalInformation_t Packet_PhysicalInformation; - Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; - + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; + EGPRS_PD_AckNack_t EGPRS_PD_AckNack; + PSI13_t PSI13; PSI1_t PSI1; PSI2_t PSI2; PSI3_t PSI3; - PSI3_BIS_t PSI3_BIS; - PSI4_t PSI4; - PSI13_t PSI13; PSI5_t PSI5; + Packet_Access_Reject_t Packet_Access_Reject; + Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; + Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; + Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; + Packet_Cell_Change_Order_t Packet_Cell_Change_Order; + Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; + Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; + Packet_Downlink_Assignment_t Packet_Downlink_Assignment; + Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; + Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; + Packet_Handover_Command_t Packet_Handover_Command; + Packet_Measurement_Order_t Packet_Measurement_Order; + Packet_Measurement_Report_t Packet_Measurement_Report; + Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; + Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; + Packet_PDCH_Release_t Packet_PDCH_Release; + Packet_PRACH_Parameters_t Packet_PRACH_Parameters; + Packet_PSI_Status_t Packet_PSI_Status; + Packet_Paging_Request_t Packet_Paging_Request; + Packet_Pause_t Packet_Pause; + Packet_PhysicalInformation_t Packet_PhysicalInformation; + Packet_Polling_Request_t Packet_Polling_Request; + Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; + Packet_Queueing_Notification_t Packet_Queueing_Notification; + Packet_Resource_Request_t Packet_Resource_Request; + Packet_SI_Status_t Packet_SI_Status; + Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; + Packet_TBF_Release_t Packet_TBF_Release; + Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; + Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; + Packet_Uplink_Assignment_t Packet_Uplink_Assignment; + Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; } u; /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I989befc56fa37b8f982301f4f9aa4f4533e3e87a Gerrit-Change-Number: 17042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:30 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17043 ) Change subject: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure ...................................................................... gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function). Port from wireshark.git commit 9f8b638cfa8a660fb64c54dcadb83e6747db0a15. Ported-by: Pau Espin Pedrol Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 --- M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp 2 files changed, 25 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 196ced2..90c5bfd 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -4528,13 +4528,6 @@ PMO_AdditionsR98_t AdditionsR98; } Packet_Measurement_Order_t; -typedef struct -{ - guint8 MESSAGE_TYPE; - guint8 PAGE_MODE; - PacketDownlinkID_t ID; -} Packet_Measurement_Order_Reduced_t; - /* Enhanced measurement report */ typedef struct @@ -4900,45 +4893,32 @@ union { guint8 MESSAGE_TYPE; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - EGPRS_PD_AckNack_t EGPRS_PD_AckNack; - PSI13_t PSI13; + Packet_Access_Reject_t Packet_Access_Reject; + Packet_Cell_Change_Order_t Packet_Cell_Change_Order; + Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; + Packet_Downlink_Assignment_t Packet_Downlink_Assignment; + Packet_Measurement_Order_t Packet_Measurement_Order; + Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; + Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; + Packet_Paging_Request_t Packet_Paging_Request; + Packet_PDCH_Release_t Packet_PDCH_Release; + Packet_Polling_Request_t Packet_Polling_Request; + Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; + Packet_PRACH_Parameters_t Packet_PRACH_Parameters; + Packet_Queueing_Notification_t Packet_Queueing_Notification; + Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; + Packet_TBF_Release_t Packet_TBF_Release; + Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; + Packet_Uplink_Assignment_t Packet_Uplink_Assignment; + Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + Packet_Handover_Command_t Packet_Handover_Command; + Packet_PhysicalInformation_t Packet_PhysicalInformation; + Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; PSI1_t PSI1; PSI2_t PSI2; PSI3_t PSI3; PSI5_t PSI5; - Packet_Access_Reject_t Packet_Access_Reject; - Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; - Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; - Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; - Packet_Cell_Change_Order_t Packet_Cell_Change_Order; - Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; - Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - Packet_Downlink_Assignment_t Packet_Downlink_Assignment; - Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; - Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; - Packet_Handover_Command_t Packet_Handover_Command; - Packet_Measurement_Order_t Packet_Measurement_Order; - Packet_Measurement_Report_t Packet_Measurement_Report; - Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; - Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; - Packet_PDCH_Release_t Packet_PDCH_Release; - Packet_PRACH_Parameters_t Packet_PRACH_Parameters; - Packet_PSI_Status_t Packet_PSI_Status; - Packet_Paging_Request_t Packet_Paging_Request; - Packet_Pause_t Packet_Pause; - Packet_PhysicalInformation_t Packet_PhysicalInformation; - Packet_Polling_Request_t Packet_Polling_Request; - Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; - Packet_Queueing_Notification_t Packet_Queueing_Notification; - Packet_Resource_Request_t Packet_Resource_Request; - Packet_SI_Status_t Packet_SI_Status; - Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; - Packet_TBF_Release_t Packet_TBF_Release; - Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; - Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; - Packet_Uplink_Assignment_t Packet_Uplink_Assignment; - Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + PSI13_t PSI13; } u; /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members @@ -4974,17 +4954,17 @@ Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; Packet_Measurement_Report_t Packet_Measurement_Report; Packet_Resource_Request_t Packet_Resource_Request; Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; Packet_PSI_Status_t Packet_PSI_Status; + EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; + Packet_Pause_t Packet_Pause; Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; Packet_SI_Status_t Packet_SI_Status; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - Packet_Pause_t Packet_Pause; } u; gint16 NrOfBits; } RlcMacUplink_t; diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index b51d735..f911b09 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -65,7 +65,6 @@ cout << "sizeof Packet_Access_Reject_t " << sizeof(Packet_Access_Reject_t) << endl; cout << "sizeof Packet_Cell_Change_Order_t " << sizeof(Packet_Cell_Change_Order_t) << endl; cout << "sizeof Packet_Downlink_Assignment_t " << sizeof(Packet_Downlink_Assignment_t) << endl; - cout << "sizeof Packet_Measurement_Order_Reduced_t " << sizeof(Packet_Measurement_Order_Reduced_t) << endl; cout << "sizeof Packet_Neighbour_Cell_Data_t " << sizeof(Packet_Neighbour_Cell_Data_t) << endl; cout << "sizeof Packet_Serving_Cell_Data_t " << sizeof(Packet_Serving_Cell_Data_t) << endl; cout << "sizeof Packet_Paging_Request_t " << sizeof(Packet_Paging_Request_t) << endl; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 Gerrit-Change-Number: 17043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:30 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: Enhance dissection of PSI1 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17044 ) Change subject: gsm_rlcmac: Enhance dissection of PSI1 ...................................................................... gsm_rlcmac: Enhance dissection of PSI1 Port of wireshark.git 7e9411fee3a101b53693210f7a38789fd4c70ba2. Ported-by: Pau Espin Pedrol Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 39 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index ed7c745..5889471 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -576,8 +576,8 @@ static const CSN_DESCR_BEGIN(GPRS_Cell_Options_t) M_UINT (GPRS_Cell_Options_t, NMO, 2), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3168, 3, 1), - M_UINT_OFFSET(GPRS_Cell_Options_t, T3192, 3, 1), + M_UINT (GPRS_Cell_Options_t, T3168, 3), + M_UINT (GPRS_Cell_Options_t, T3192, 3), M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3), M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE), M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE), @@ -4167,12 +4167,18 @@ /*< Packet System Information Type 1 message content >*/ +CSN_DESCR_BEGIN(PSI1_AdditionsR6_t) + M_UINT (PSI1_AdditionsR6_t, LB_MS_TXPWR_MAX_CCH, 5), +CSN_DESCR_END (PSI1_AdditionsR6_t) + static const -CSN_DESCR_BEGIN(PSI1_AdditionsR99_t) - M_UINT (PSI1_AdditionsR99_t, MSCR, 1), - M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), - M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), -CSN_DESCR_END (PSI1_AdditionsR99_t) +CSN_DESCR_BEGIN (PSI1_AdditionsR99_t) + M_UINT (PSI1_AdditionsR99_t, MSCR, 1), + M_UINT (PSI1_AdditionsR99_t, SGSNR, 1), + M_UINT (PSI1_AdditionsR99_t, BandIndicator, 1), + M_NEXT_EXIST_OR_NULL (PSI1_AdditionsR99_t, Exist_AdditionsR6, 1), + M_TYPE (PSI1_AdditionsR99_t, AdditionsR6, PSI1_AdditionsR6_t), +CSN_DESCR_END (PSI1_AdditionsR99_t) static const CSN_DESCR_BEGIN(PCCCH_Organization_t) @@ -4185,26 +4191,26 @@ static const CSN_DESCR_BEGIN(PSI1_t) - M_UINT (PSI1_t, MESSAGE_TYPE, 6), - M_UINT (PSI1_t, PAGE_MODE, 2), + M_UINT (PSI1_t, MESSAGE_TYPE, 6), + M_UINT (PSI1_t, PAGE_MODE, 2), - M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), - M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), - M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), - M_UINT (PSI1_t, PSI_COUNT_LR, 6), + M_UINT (PSI1_t, PBCCH_CHANGE_MARK, 3), + M_UINT (PSI1_t, PSI_CHANGE_FIELD, 4), + M_UINT (PSI1_t, PSI1_REPEAT_PERIOD, 4), + M_UINT (PSI1_t, PSI_COUNT_LR, 6), - M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), - M_UINT (PSI1_t, PSI_COUNT_HR, 4), + M_NEXT_EXIST (PSI1_t, Exist_PSI_COUNT_HR, 1), + M_UINT (PSI1_t, PSI_COUNT_HR, 4), - M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), - M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), - M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), - M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), - M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), - M_UINT (PSI1_t, PSI_STATUS_IND, 1), + M_UINT (PSI1_t, MEASUREMENT_ORDER, 1), + M_TYPE (PSI1_t, GPRS_Cell_Options, GPRS_Cell_Options_t), + M_TYPE (PSI1_t, PRACH_Control, PRACH_Control_t), + M_TYPE (PSI1_t, PCCCH_Organization, PCCCH_Organization_t), + M_TYPE (PSI1_t, Global_Power_Control_Parameters, Global_Power_Control_Parameters_t), + M_UINT (PSI1_t, PSI_STATUS_IND, 1), - M_NEXT_EXIST (PSI1_t, Exist_AdditionsR99, 1), - M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), + M_NEXT_EXIST_OR_NULL (PSI1_t, Exist_AdditionsR99, 1), + M_TYPE (PSI1_t, AdditionsR99, PSI1_AdditionsR99_t), M_PADDING_BITS(PSI1_t), CSN_DESCR_END (PSI1_t) diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 90c5bfd..b05483c 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -2492,9 +2492,16 @@ typedef struct { - guint8 MSCR; - guint8 SGSNR; - guint8 BandIndicator; + guint8 LB_MS_TXPWR_MAX_CCH; +} PSI1_AdditionsR6_t; + +typedef struct +{ + guint8 MSCR; + guint8 SGSNR; + guint8 BandIndicator; + gboolean Exist_AdditionsR6; + PSI1_AdditionsR6_t AdditionsR6; } PSI1_AdditionsR99_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I89d488c1f349c556e40a9d13895b1309d5140212 Gerrit-Change-Number: 17044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:30 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17045 ) Change subject: gsm_rlcmac.cpp: Fix trailing whitespace ...................................................................... gsm_rlcmac.cpp: Fix trailing whitespace Change-Id: I3b50cf386d417ba73b97f48b3000f69d9a54c8c9 --- M src/gsm_rlcmac.cpp 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 5889471..d9a11eb 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -4235,10 +4235,10 @@ static const CSN_DESCR_BEGIN(Non_GPRS_Cell_Options_t) M_BIT (Non_GPRS_Cell_Options_t, ATT), - + M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_T3212, 1), M_UINT (Non_GPRS_Cell_Options_t, T3212, 8), - + M_BIT (Non_GPRS_Cell_Options_t, NECI), M_BIT (Non_GPRS_Cell_Options_t, PWRC), M_UINT (Non_GPRS_Cell_Options_t, DTX, 2), @@ -4343,7 +4343,7 @@ M_BIT (Gen_Cell_Sel_t, C31_HYST), M_BIT (Gen_Cell_Sel_t, C32_QUAL), M_FIXED (Gen_Cell_Sel_t, 1, 0x01), - + M_NEXT_EXIST (Gen_Cell_Sel_t, Exist_T_RESEL, 1), M_UINT (Gen_Cell_Sel_t, T_RESEL, 3), @@ -4440,7 +4440,7 @@ M_TYPE (PSI3_t, Serving_Cell_params, Serving_Cell_params_t), M_TYPE (PSI3_t, General_Cell_Selection, Gen_Cell_Sel_t), M_TYPE (PSI3_t, NeighbourCellList, NeighbourCellList_t), - + M_NEXT_EXIST (PSI3_t, Exist_AdditionR98, 1), M_TYPE (PSI3_t, AdditionR98, PSI3_AdditionR98_t), @@ -4482,14 +4482,14 @@ M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existRepParamsFDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, RepQuantFDD, 1), M_UINT (GPRSMeasurementParams3G_PSI5_t, MultiratReportingFDD, 2), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existReportingParamsFDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingOffsetFDD, 3), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingThresholdFDD, 3), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existMultiratReportingTDD, 1), M_UINT (GPRSMeasurementParams3G_PSI5_t, MultiratReportingTDD, 2), - + M_NEXT_EXIST (GPRSMeasurementParams3G_PSI5_t, existOffsetThresholdTDD, 2), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingOffsetTDD, 3), M_UINT (GPRSMeasurementParams3G_PSI5_t, ReportingThresholdTDD, 3), @@ -4503,10 +4503,10 @@ M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_NCC_PERMITTED, 1), M_UINT (ENH_Reporting_Parameters_t, NCC_PERMITTED, 8), - + M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_GPRSMeasurementParams, 1), M_TYPE (ENH_Reporting_Parameters_t, GPRSMeasurementParams, MeasurementParams_t), - + M_NEXT_EXIST (ENH_Reporting_Parameters_t, Exist_GPRSMeasurementParams3G, 1), M_TYPE (ENH_Reporting_Parameters_t, GPRSMeasurementParams3G, GPRSMeasurementParams3G_PSI5_t), CSN_DESCR_END (ENH_Reporting_Parameters_t) @@ -4524,7 +4524,7 @@ CSN_DESCR_BEGIN(PSI5_AdditionsR5) M_NEXT_EXIST (PSI5_AdditionsR5, Exist_GPRS_AdditionalMeasurementParams3G, 1), M_TYPE (PSI5_AdditionsR5, GPRS_AdditionalMeasurementParams3G, GPRS_AdditionalMeasurementParams3G_t), - + M_NEXT_EXIST (PSI5_AdditionsR5, Exist_AdditionsR7, 1), M_TYPE (PSI5_AdditionsR5, AdditionsR7, PSI5_AdditionsR7), CSN_DESCR_END (PSI5_AdditionsR5) @@ -4587,7 +4587,7 @@ M_UINT (PSI13_t, PAGE_MODE, 2), M_UINT (PSI13_t, BCCH_CHANGE_MARK, 3), M_UINT (PSI13_t, SI_CHANGE_FIELD, 4), - + M_NEXT_EXIST (PSI13_t, Exist_MA, 2), M_UINT (PSI13_t, SI13_CHANGE_MARK, 2), M_TYPE (PSI13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), @@ -5473,7 +5473,7 @@ LOGPC(DRLCMACDATA, LOGL_NOTICE, "RRBP = %u ", (unsigned)(data->RRBP)); LOGPC(DRLCMACDATA, LOGL_NOTICE, "SP = %u ", (unsigned)(data->SP)); LOGPC(DRLCMACDATA, LOGL_NOTICE, "USF = %u ", (unsigned)(data->USF)); - + // Octet 1 bitvec_write_field(vector, &writeIndex, data->PR, 2); bitvec_write_field(vector, &writeIndex, data->TFI, 5); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3b50cf386d417ba73b97f48b3000f69d9a54c8c9 Gerrit-Change-Number: 17045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:31 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17046 ) Change subject: gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. ...................................................................... gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. Port from wireshark.git e97273a35d101516decbc7d98fcc6c6b3f193962. Ported-by: Pau Espin Pedrol Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea --- M src/gsm_rlcmac.cpp 1 file changed, 61 insertions(+), 61 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index d9a11eb..c12c3e5 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -104,7 +104,7 @@ M_UINT (GPRS_Power_Control_Parameters_t, ALPHA, 4), M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_W, 5), M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_T, 5), - M_BIT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN), + M_UINT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN, 1), M_UINT (GPRS_Power_Control_Parameters_t, N_AVG_I, 4), CSN_DESCR_END (GPRS_Power_Control_Parameters_t) @@ -258,8 +258,8 @@ static const CSN_DESCR_BEGIN(Group_Call_Reference_t) M_UINT (Group_Call_Reference_t, value, 27), - M_BIT (Group_Call_Reference_t, SF), - M_BIT (Group_Call_Reference_t, AF), + M_UINT (Group_Call_Reference_t, SF, 1), + M_UINT (Group_Call_Reference_t, AF, 1), M_UINT (Group_Call_Reference_t, call_priority, 3), M_UINT (Group_Call_Reference_t, Ciphering_information, 4), CSN_DESCR_END (Group_Call_Reference_t) @@ -542,7 +542,7 @@ M_UINT (Packet_Polling_Request_t, MESSAGE_TYPE, 6), M_UINT (Packet_Polling_Request_t, PAGE_MODE, 2), M_TYPE (Packet_Polling_Request_t, ID, PacketPollingID_t), - M_BIT (Packet_Polling_Request_t, TYPE_OF_ACK), + M_UINT (Packet_Polling_Request_t, TYPE_OF_ACK, 1), M_PADDING_BITS(Packet_Polling_Request_t), CSN_DESCR_END (Packet_Polling_Request_t) @@ -579,8 +579,8 @@ M_UINT (GPRS_Cell_Options_t, T3168, 3), M_UINT (GPRS_Cell_Options_t, T3192, 3), M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3), - M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE), - M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE), + M_UINT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE, 1), + M_UINT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE, 1), M_UINT (GPRS_Cell_Options_t, BS_CV_MAX, 4), M_NEXT_EXIST (GPRS_Cell_Options_t, Exist_PAN, 3), @@ -595,7 +595,7 @@ static const CSN_DESCR_BEGIN(PBCCH_Not_present_t) M_UINT (PBCCH_Not_present_t, RAC, 8), - M_BIT (PBCCH_Not_present_t, SPGC_CCCH_SUP), + M_UINT (PBCCH_Not_present_t, SPGC_CCCH_SUP, 1), M_UINT (PBCCH_Not_present_t, PRIORITY_ACCESS_THR, 3), M_UINT (PBCCH_Not_present_t, NETWORK_CONTROL_ORDER, 2), M_TYPE (PBCCH_Not_present_t, GPRS_Cell_Options, GPRS_Cell_Options_t), @@ -676,8 +676,8 @@ M_UINT (Packet_TBF_Release_t, PAGE_MODE, 2), M_FIXED (Packet_TBF_Release_t, 1, 0x00), M_TYPE (Packet_TBF_Release_t, Global_TFI, Global_TFI_t), - M_BIT (Packet_TBF_Release_t, UPLINK_RELEASE), - M_BIT (Packet_TBF_Release_t, DOWNLINK_RELEASE), + M_UINT (Packet_TBF_Release_t, UPLINK_RELEASE, 1), + M_UINT (Packet_TBF_Release_t, DOWNLINK_RELEASE, 1), M_UINT (Packet_TBF_Release_t, TBF_RELEASE_CAUSE, 4), M_PADDING_BITS(Packet_TBF_Release_t ), CSN_DESCR_END (Packet_TBF_Release_t) @@ -1044,8 +1044,8 @@ CSN_DESCR_BEGIN(Channel_Request_Description_t) M_UINT (Channel_Request_Description_t, PEAK_THROUGHPUT_CLASS, 4), M_UINT (Channel_Request_Description_t, RADIO_PRIORITY, 2), - M_BIT (Channel_Request_Description_t, RLC_MODE), - M_BIT (Channel_Request_Description_t, LLC_PDU_TYPE), + M_UINT (Channel_Request_Description_t, RLC_MODE, 1), + M_UINT (Channel_Request_Description_t, LLC_PDU_TYPE, 1), M_UINT (Channel_Request_Description_t, RLC_OCTET_COUNT, 16), CSN_DESCR_END (Channel_Request_Description_t) @@ -1752,7 +1752,7 @@ static const CSN_DESCR_BEGIN (PUA_GPRS_t) M_UINT (PUA_GPRS_t, CHANNEL_CODING_COMMAND, 2), - M_BIT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING), + M_UINT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING, 1), M_TYPE (PUA_GPRS_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (PUA_GPRS_t, Exist_Frequency_Parameters, 1), @@ -1903,14 +1903,14 @@ M_FIXED (Packet_Downlink_Assignment_t, 1, 0x00),/*-- Message escape */ M_UINT (Packet_Downlink_Assignment_t, MAC_MODE, 2), - M_BIT (Packet_Downlink_Assignment_t, RLC_MODE), - M_BIT (Packet_Downlink_Assignment_t, CONTROL_ACK), + M_UINT (Packet_Downlink_Assignment_t, RLC_MODE, 1), + M_UINT (Packet_Downlink_Assignment_t, CONTROL_ACK, 1), M_UINT (Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8), M_TYPE (Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3), M_UINT (Packet_Downlink_Assignment_t, P0, 4), - M_BIT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE), + M_UINT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1), M_UINT (Packet_Downlink_Assignment_t, PR_MODE, 1), M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_Frequency_Parameters, 1), @@ -1951,7 +1951,7 @@ static const CSN_DESCR_BEGIN(DTM_Packet_Uplink_Assignment_t) M_UINT (DTM_Packet_Uplink_Assignment_t, CHANNEL_CODING_COMMAND, 2), - M_BIT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING), + M_UINT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING, 1), M_TYPE (DTM_Packet_Uplink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_UNION (DTM_Packet_Uplink_Assignment_t, 3), @@ -1975,13 +1975,13 @@ static const CSN_DESCR_BEGIN(DTM_Packet_Downlink_Assignment_t) M_UINT (DTM_Packet_Downlink_Assignment_t, MAC_MODE, 2), - M_BIT (DTM_Packet_Downlink_Assignment_t, RLC_MODE), + M_UINT (DTM_Packet_Downlink_Assignment_t, RLC_MODE ,1), M_UINT (DTM_Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8), M_TYPE (DTM_Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t), M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3), M_UINT (DTM_Packet_Downlink_Assignment_t, P0, 4), - M_BIT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE), + M_UINT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1), M_UINT (DTM_Packet_Downlink_Assignment_t, PR_MODE, 1), M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_Power_Control_Parameters, 1), @@ -2876,7 +2876,7 @@ static const CSN_DESCR_BEGIN(GPRS_EUTRAN_MeasurementParametersDescription_t) M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, Qsearch_P_EUTRAN, 4), - M_BIT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT), + M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT, 1), M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_MULTIRAT_REPORTING, 2), M_TYPE (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REPORTING_THRESHOLD_OFFSET, EUTRAN_REPORTING_THRESHOLD_OFFSET_t), CSN_DESCR_END (GPRS_EUTRAN_MeasurementParametersDescription_t) @@ -2942,7 +2942,7 @@ static const CSN_DESCR_BEGIN(EUTRAN_ParametersDescription_PMO_t) - M_BIT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE), + M_UINT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE, 1), M_NEXT_EXIST (EUTRAN_ParametersDescription_PMO_t, existGPRS_EUTRAN_MeasurementParametersDescription, 1), M_TYPE (EUTRAN_ParametersDescription_PMO_t, GPRS_EUTRAN_MeasurementParametersDescription, GPRS_EUTRAN_MeasurementParametersDescription_t), @@ -2956,7 +2956,7 @@ CSN_DESCR_BEGIN(PSC_Pattern_t) M_UINT (PSC_Pattern_t, PSC_Pattern_length, 3), M_VAR_BITMAP (PSC_Pattern_t, PSC_Pattern, PSC_Pattern_length, 1), - M_BIT (PSC_Pattern_t, PSC_Pattern_sense), + M_UINT (PSC_Pattern_t, PSC_Pattern_sense, 1), CSN_DESCR_END (PSC_Pattern_t) static const @@ -2990,13 +2990,13 @@ static const CSN_DESCR_BEGIN(Meas_Ctrl_Param_Desp_t) M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_EUTRAN, 3), - M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN), - M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3), + M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN, 1), + M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3), M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX, Count_EUTRAN_FREQUENCY_INDEX, 3), M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_UTRAN, 1), - M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN), - M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5), - M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5), + M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN, 1), + M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5), + M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5), CSN_DESCR_END (Meas_Ctrl_Param_Desp_t) static const @@ -3134,8 +3134,8 @@ static const CSN_DESCR_BEGIN (PMO_AdditionsR8_t) M_NEXT_EXIST (PMO_AdditionsR8_t, existBA_IND_3G_PMO_IND, 2), - M_BIT (PMO_AdditionsR8_t, BA_IND_3G), - M_BIT (PMO_AdditionsR8_t, PMO_IND), + M_UINT (PMO_AdditionsR8_t, BA_IND_3G, 1), + M_UINT (PMO_AdditionsR8_t, PMO_IND, 1), M_NEXT_EXIST (PMO_AdditionsR8_t, existPriorityAndEUTRAN_ParametersDescription_PMO, 1), M_TYPE (PMO_AdditionsR8_t, PriorityAndEUTRAN_ParametersDescription_PMO, PriorityAndEUTRAN_ParametersDescription_PMO_t), M_NEXT_EXIST (PMO_AdditionsR8_t, existIndividualPriorities_PMO, 1), @@ -3447,19 +3447,19 @@ M_NEXT_EXIST (UTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1), M_TYPE (UTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t), M_UINT (UTRAN_CSG_Measurement_Report_t, CSG_ID, 27), - M_BIT (UTRAN_CSG_Measurement_Report_t, Access_Mode), + M_UINT (UTRAN_CSG_Measurement_Report_t, Access_Mode, 1), M_UINT (UTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), CSN_DESCR_END (UTRAN_CSG_Measurement_Report_t) static const CSN_DESCR_BEGIN(EUTRAN_CSG_Measurement_Report_t) - M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28), - M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16), + M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28), + M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16), M_NEXT_EXIST (EUTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1), M_TYPE (EUTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t), - M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27), - M_BIT (EUTRAN_CSG_Measurement_Report_t, Access_Mode), - M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), + M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27), + M_UINT (EUTRAN_CSG_Measurement_Report_t, Access_Mode, 1), + M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6), CSN_DESCR_END (EUTRAN_CSG_Measurement_Report_t) static const @@ -3505,7 +3505,7 @@ static const CSN_DESCR_BEGIN(EMR_ServingCell_t) /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/ - M_BIT (EMR_ServingCell_t, DTX_USED), + M_UINT (EMR_ServingCell_t, DTX_USED, 1), M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6), M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3), M_UINT (EMR_ServingCell_t, MEAN_BEP, 5), @@ -3699,7 +3699,7 @@ static const CSN_DESCR_BEGIN(Eutran_Ccn_Measurement_Report_t) - M_BIT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED), + M_UINT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED, 1), M_UINT_OFFSET(Eutran_Ccn_Measurement_Report_t, N_EUTRAN, 2, 1), M_VAR_TARRAY (Eutran_Ccn_Measurement_Report_t, Eutran_Ccn_Measurement_Report_Cell, Eutran_Ccn_Measurement_Report_Cell_t, N_EUTRAN), CSN_DESCR_END (Eutran_Ccn_Measurement_Report_t) @@ -3881,12 +3881,12 @@ static const CSN_DESCR_BEGIN (NC_MeasurementReport_t) - M_BIT (NC_MeasurementReport_t, NC_MODE), + M_UINT (NC_MeasurementReport_t, NC_MODE, 1), M_UNION (NC_MeasurementReport_t, 2), M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t), - M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), - M_BIT (NC_MeasurementReport_t, PMO_USED), - M_BIT (NC_MeasurementReport_t, SCALE), + M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2), + M_UINT (NC_MeasurementReport_t, PMO_USED, 1), + M_UINT (NC_MeasurementReport_t, SCALE, 1), M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1), M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t), @@ -3911,9 +3911,9 @@ CSN_DESCR_BEGIN (PHO_DownlinkAssignment_t) M_UINT (PHO_DownlinkAssignment_t, TimeslotAllocation, 8), M_UINT (PHO_DownlinkAssignment_t, PFI, 7), - M_BIT (PHO_DownlinkAssignment_t, RLC_Mode), + M_UINT (PHO_DownlinkAssignment_t, RLC_Mode, 1), M_UINT (PHO_DownlinkAssignment_t, TFI_Assignment, 5), - M_BIT (PHO_DownlinkAssignment_t, ControlACK), + M_UINT (PHO_DownlinkAssignment_t, ControlACK, 1), M_NEXT_EXIST (PHO_DownlinkAssignment_t, Exist_EGPRS_WindowSize, 1), M_UINT (PHO_DownlinkAssignment_t, EGPRS_WindowSize, 5), @@ -3934,7 +3934,7 @@ static const CSN_DESCR_BEGIN (PHO_UplinkAssignment_t) M_UINT (PHO_UplinkAssignment_t, PFI, 7), - M_BIT (PHO_UplinkAssignment_t, RLC_Mode), + M_UINT (PHO_UplinkAssignment_t, RLC_Mode, 1), M_UINT (PHO_UplinkAssignment_t, TFI_Assignment, 5), M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_ChannelCodingCommand, 1), @@ -3946,7 +3946,7 @@ M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_EGPRS_WindowSize, 1), M_UINT (PHO_UplinkAssignment_t, EGPRS_WindowSize, 5), - M_BIT (PHO_UplinkAssignment_t, USF_Granularity), + M_UINT (PHO_UplinkAssignment_t, USF_Granularity, 1), M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_TBF_TimeslotAllocation, 1), M_LEFT_VAR_BMP (PHO_UplinkAssignment_t, TBF_TimeslotAllocation, u.USF_AllocationArray.NBR_OfAllocatedTimeslots, 0), @@ -4043,13 +4043,13 @@ M_UINT (PHO_RadioResources_t, ARFCN, 10), M_UINT (PHO_RadioResources_t, SI, 2), - M_BIT (PHO_RadioResources_t, NCI), + M_UINT (PHO_RadioResources_t, NCI, 1), M_UINT (PHO_RadioResources_t, BSIC, 6), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active, 1), - M_BIT (PHO_RadioResources_t, CCN_Active), + M_UINT (PHO_RadioResources_t, CCN_Active, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active_3G, 1), - M_BIT (PHO_RadioResources_t, CCN_Active_3G), + M_UINT (PHO_RadioResources_t, CCN_Active_3G, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Support_Description, 1), M_TYPE (PHO_RadioResources_t, CCN_Support_Description, CCN_Support_Description_t), @@ -4059,11 +4059,11 @@ M_NEXT_EXIST (PHO_RadioResources_t, Exist_PHO_TimingAdvance, 1), M_TYPE (PHO_RadioResources_t, PHO_TimingAdvance, PHO_TimingAdvance_t), - M_BIT (PHO_RadioResources_t, Extended_Dynamic_Allocation), - M_BIT (PHO_RadioResources_t, RLC_Reset), + M_UINT (PHO_RadioResources_t, Extended_Dynamic_Allocation, 1), + M_UINT (PHO_RadioResources_t, RLC_Reset, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_PO_PR, 2), M_UINT (PHO_RadioResources_t, PO, 4), - M_BIT (PHO_RadioResources_t, PR_Mode), + M_UINT (PHO_RadioResources_t, PR_Mode, 1), M_NEXT_EXIST (PHO_RadioResources_t, Exist_UplinkControlTimeslot, 1), @@ -4234,13 +4234,13 @@ static const CSN_DESCR_BEGIN(Non_GPRS_Cell_Options_t) - M_BIT (Non_GPRS_Cell_Options_t, ATT), + M_UINT (Non_GPRS_Cell_Options_t, ATT, 1), M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_T3212, 1), M_UINT (Non_GPRS_Cell_Options_t, T3212, 8), - M_BIT (Non_GPRS_Cell_Options_t, NECI), - M_BIT (Non_GPRS_Cell_Options_t, PWRC), + M_UINT (Non_GPRS_Cell_Options_t, NECI, 1), + M_UINT (Non_GPRS_Cell_Options_t, PWRC, 1), M_UINT (Non_GPRS_Cell_Options_t, DTX, 2), M_UINT (Non_GPRS_Cell_Options_t, RADIO_LINK_TIMEOUT, 4), M_UINT (Non_GPRS_Cell_Options_t, BS_AG_BLKS_RES, 3), @@ -4248,7 +4248,7 @@ M_UINT (Non_GPRS_Cell_Options_t, BS_PA_MFRMS, 3), M_UINT (Non_GPRS_Cell_Options_t, MAX_RETRANS, 2), M_UINT (Non_GPRS_Cell_Options_t, TX_INTEGER, 4), - M_BIT (Non_GPRS_Cell_Options_t, EC), + M_UINT (Non_GPRS_Cell_Options_t, EC, 1), M_UINT (Non_GPRS_Cell_Options_t, MS_TXPWR_MAX_CCCH, 5), M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_Extension_Bits, 1), @@ -4327,8 +4327,8 @@ /*< Packet System Information Type 3 message content >*/ static const CSN_DESCR_BEGIN(Serving_Cell_params_t) - M_BIT (Serving_Cell_params_t, CELL_BAR_ACCESS_2), - M_BIT (Serving_Cell_params_t, EXC_ACC), + M_UINT (Serving_Cell_params_t, CELL_BAR_ACCESS_2, 1), + M_UINT (Serving_Cell_params_t, EXC_ACC, 1), M_UINT (Serving_Cell_params_t, GPRS_RXLEV_ACCESS_MIN, 6), M_UINT (Serving_Cell_params_t, GPRS_MS_TXPWR_MAX_CCH, 5), M_NEXT_EXIST (Serving_Cell_params_t, Exist_HCS, 1), @@ -4340,8 +4340,8 @@ static const CSN_DESCR_BEGIN(Gen_Cell_Sel_t) M_UINT (Gen_Cell_Sel_t, GPRS_CELL_RESELECT_HYSTERESIS, 3), - M_BIT (Gen_Cell_Sel_t, C31_HYST), - M_BIT (Gen_Cell_Sel_t, C32_QUAL), + M_UINT (Gen_Cell_Sel_t, C31_HYST, 1), + M_UINT (Gen_Cell_Sel_t, C32_QUAL, 1), M_FIXED (Gen_Cell_Sel_t, 1, 0x01), M_NEXT_EXIST (Gen_Cell_Sel_t, Exist_T_RESEL, 1), @@ -4355,9 +4355,9 @@ static const CSN_DESCR_BEGIN(COMPACT_Cell_Sel_t) M_UINT (COMPACT_Cell_Sel_t, bsic, 6), - M_BIT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2), - M_BIT (COMPACT_Cell_Sel_t, EXC_ACC), - M_BIT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL), + M_UINT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2, 1), + M_UINT (COMPACT_Cell_Sel_t, EXC_ACC, 1), + M_UINT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL, 1), M_NEXT_EXIST (COMPACT_Cell_Sel_t, Exist_GPRS_RXLEV_ACCESS_MIN, 2), M_UINT (COMPACT_Cell_Sel_t, GPRS_RXLEV_ACCESS_MIN, 6), M_UINT (COMPACT_Cell_Sel_t, GPRS_MS_TXPWR_MAX_CCH, 5), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea Gerrit-Change-Number: 17046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:31 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17047 ) Change subject: gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing ...................................................................... gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing Port from wireshark.git c4ead251da7199cfd746d378c51eb8c30d09a6ba. Ported-by: Pau Espin Pedrol Change-Id: Ib9b8eafd69d3b45b0d631ba9635689807b472b73 --- M src/gsm_rlcmac.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c12c3e5..7006900 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -3959,7 +3959,7 @@ static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_UA_t) M_TYPE (GlobalTimeslotDescription_UA_t, GlobalTimeslotDescription, GlobalTimeslotDescription_t), - M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 3), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 2), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ M_TYPE (GlobalTimeslotDescription_UA_t, PHO_UA, PHO_UplinkAssignment_t), M_FIXED (GlobalTimeslotDescription_UA_t, 1, 0x0), /* Escape recursive */ @@ -4012,7 +4012,7 @@ M_NEXT_EXIST (PHO_EGPRS_t, Exist_GlobalTimeslotDescription_UA, 1), M_TYPE (PHO_EGPRS_t, GTD_UA, GlobalTimeslotDescription_UA_t), - M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 2), + M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 1), M_TYPE (PHO_EGPRS_t, DownlinkTBF, DownlinkTBF_t), CSN_DESCR_END (PHO_EGPRS_t) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib9b8eafd69d3b45b0d631ba9635689807b472b73 Gerrit-Change-Number: 17047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:31 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix an out of bounds access In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17048 ) Change subject: gsm_rlcmac.cpp: fix an out of bounds access ...................................................................... gsm_rlcmac.cpp: fix an out of bounds access Port from wireshark.git a4a5adb68b898f770e2addf9168d796979ebe237. Ported-by: Pau Espin Pedrol Change-Id: I23fb2199fc8f9cc3e5bd475e2558ee8d482df1e1 --- M src/gsm_rlcmac.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 7006900..39f328d 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -3480,7 +3480,7 @@ static const CSN_DESCR_BEGIN (PMR_AdditionsR5_t) - M_NEXT_EXIST (PMR_AdditionsR5_t, Exist_GRNTI, 4), + M_NEXT_EXIST (PMR_AdditionsR5_t, Exist_GRNTI, 3), M_UINT (PMR_AdditionsR5_t, GRNTI, 4), M_NEXT_EXIST_OR_NULL (PMR_AdditionsR5_t, Exist_AdditionsR8, 1), M_TYPE (PMR_AdditionsR5_t, AdditionsR8, PMR_AdditionsR8_t), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I23fb2199fc8f9cc3e5bd475e2558ee8d482df1e1 Gerrit-Change-Number: 17048 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:32 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: add dissection of NAS container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17049 ) Change subject: gsm_rlcmac: add dissection of NAS container ...................................................................... gsm_rlcmac: add dissection of NAS container Port from wireshark.git 575e4df4aa3392ffd09ca372859573f09f0a5c57 Ported-by: Pau Espin Pedrol Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 20 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 39f328d..4550c47 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -4024,10 +4024,16 @@ CSN_DESCR_END (PHO_TimingAdvance_t) static const -CSN_DESCR_BEGIN(NAS_Container_t) - M_UINT (NAS_Container_t, NAS_ContainerLength, 7), - M_VAR_ARRAY (NAS_Container_t, NAS_Container, NAS_ContainerLength, 0), -CSN_DESCR_END (NAS_Container_t) +CSN_DESCR_BEGIN(NAS_Container_For_PS_HO_t) + M_UINT (NAS_Container_For_PS_HO_t, NAS_ContainerLength, 7), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1a, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1b, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1c, 1), + M_UINT (NAS_Container_For_PS_HO_t, Old_XID, 1), + M_UINT (NAS_Container_For_PS_HO_t, Spare_1e, 1), + M_UINT (NAS_Container_For_PS_HO_t, Type_of_Ciphering_Algo, 3), + M_UINT (NAS_Container_For_PS_HO_t, IOV_UI_value, 32), +CSN_DESCR_END (NAS_Container_For_PS_HO_t) static const CSN_DESCR_BEGIN(PS_HandoverTo_UTRAN_Payload_t) @@ -4080,7 +4086,7 @@ M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, PHO_RadioResources, PHO_RadioResources_t), M_NEXT_EXIST (PS_HandoverTo_A_GB_ModePayload_t, Exist_NAS_Container, 1), - M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_t), + M_TYPE (PS_HandoverTo_A_GB_ModePayload_t, NAS_Container, NAS_Container_For_PS_HO_t), CSN_DESCR_END (PS_HandoverTo_A_GB_ModePayload_t) static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index b05483c..461fda3 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -415,7 +415,6 @@ #define MAX_ALLOCATION_BITMAP_LENGTH 128 /* max length of Fixed Allocation bitmap in BITS (2^7) */ #define MAX_VAR_LENGTH_BITMAP_LENGTH 176 /* max length ever possible for variable length fixed allocation bitmap */ #define MAX_RRC_CONTAINER_LENGTH 255 -#define MAX_NAS_CONTAINER_LENGTH 127 typedef struct @@ -4693,8 +4692,14 @@ typedef struct { guint8 NAS_ContainerLength; - guint8 NAS_Container[MAX_NAS_CONTAINER_LENGTH]; -} NAS_Container_t; + guint8 Spare_1a; + guint8 Spare_1b; + guint8 Spare_1c; + guint8 Old_XID; + guint8 Spare_1e; + guint8 Type_of_Ciphering_Algo; + guint32 IOV_UI_value; +} NAS_Container_For_PS_HO_t; typedef struct { @@ -4740,7 +4745,7 @@ { PHO_RadioResources_t PHO_RadioResources; guint8 Exist_NAS_Container; - NAS_Container_t NAS_Container; + NAS_Container_For_PS_HO_t NAS_Container; } PS_HandoverTo_A_GB_ModePayload_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a05a057b6f441364502a96f9f34872c7e251a36 Gerrit-Change-Number: 17049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:38:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:38:52 +0000 Subject: Change in osmo-msc[master]: osmo-msc: use stderr to print error messages, not stdout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17040 ) Change subject: osmo-msc: use stderr to print error messages, not stdout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I702dd054d2e881b526f701ca482ec0f64ba8da28 Gerrit-Change-Number: 17040 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:38:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:03 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17023 ) Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 21:39:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:08 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.h: remove unused sms_deliver definition In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17023 ) Change subject: libmsc/gsm_04_11.h: remove unused sms_deliver definition ...................................................................... libmsc/gsm_04_11.h: remove unused sms_deliver definition Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca --- M include/osmocom/msc/gsm_04_11.h 1 file changed, 0 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index c504c7f..19aaa3a 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -11,24 +11,6 @@ #define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */ -/* SMS deliver PDU */ -struct sms_deliver { - uint8_t mti:2; /* message type indicator */ - uint8_t mms:1; /* more messages to send */ - uint8_t rp:1; /* reply path */ - uint8_t udhi:1; /* user data header indicator */ - uint8_t sri:1; /* status report indication */ - uint8_t *orig_addr; /* originating address */ - uint8_t pid; /* protocol identifier */ - uint8_t dcs; /* data coding scheme */ - /* service centre time stamp */ - uint8_t ud_len; /* user data length */ - uint8_t *user_data; /* user data */ - - uint8_t msg_ref; /* message reference */ - uint8_t *smsc; -}; - struct gsm_network; struct msgb; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icd4b0c45d994dd02d9118890eb5a1261a2008eca Gerrit-Change-Number: 17023 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:09 +0000 Subject: Change in osmo-msc[master]: osmo-msc: use stderr to print error messages, not stdout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17040 ) Change subject: osmo-msc: use stderr to print error messages, not stdout ...................................................................... osmo-msc: use stderr to print error messages, not stdout Change-Id: I702dd054d2e881b526f701ca482ec0f64ba8da28 --- M src/osmo-msc/msc_main.c 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index dc6b684..cf1e504 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -609,20 +610,20 @@ msc_network->ctrl = ctrl_interface_setup_dynip(msc_network, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_MSC, NULL); if (!msc_network->ctrl) { - printf("Failed to initialize control interface. Exiting.\n"); + fprintf(stderr, "Failed to initialize control interface. Exiting.\n"); return -1; } #if 0 TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_install(). if (bsc_base_ctrl_cmds_install() != 0) { - printf("Failed to initialize the BSC control commands.\n"); + fprintf(stderr, "Failed to initialize the BSC control commands.\n"); return -1; } #endif if (msc_ctrl_cmds_install(msc_network) != 0) { - printf("Failed to initialize the MSC control commands.\n"); + fprintf(stderr, "Failed to initialize the MSC control commands.\n"); return -1; } @@ -632,8 +633,8 @@ * should try to use the nanoseconds part of the current time. */ if (db_init(msc_cmdline_config.database_name)) { - printf("DB: Failed to init database: %s\n", - msc_cmdline_config.database_name); + fprintf(stderr, "DB: Failed to init database: %s\n", + msc_cmdline_config.database_name); return 4; } @@ -650,7 +651,7 @@ } if (db_prepare()) { - printf("DB: Failed to prepare database.\n"); + fprintf(stderr, "DB: Failed to prepare database.\n"); return 5; } @@ -669,17 +670,17 @@ msc_network, &msc_network->mgw.conf); if (mgcp_client_connect(msc_network->mgw.client)) { - printf("MGCPGW connect failed\n"); + fprintf(stderr, "MGCPGW connect failed\n"); return 7; } if (ss7_setup(tall_msc_ctx, &sccp_a, &sccp_iu)) { - printf("Setting up SCCP client failed.\n"); + fprintf(stderr, "Setting up SCCP client failed.\n"); return 8; } if (sgs_server_open(g_sgs)) { - printf("Starting SGs server failed\n"); + fprintf(stderr, "Starting SGs server failed\n"); return 9; } @@ -687,7 +688,7 @@ "OsmoMSC-A", &msc_ran_infra[OSMO_RAT_GERAN_A], msc_network); if (!msc_network->a.sri) { - printf("Setting up A receiver failed\n"); + fprintf(stderr, "Setting up A receiver failed\n"); return 10; } LOGP(DMSC, LOGL_NOTICE, "A-interface: SCCP user %s, cs7-instance %u (%s)\n", @@ -702,7 +703,7 @@ "OsmoMSC-IuCS", &msc_ran_infra[OSMO_RAT_UTRAN_IU], msc_network); if (!msc_network->iu.sri) { - printf("Setting up IuCS receiver failed\n"); + fprintf(stderr, "Setting up IuCS receiver failed\n"); return 11; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I702dd054d2e881b526f701ca482ec0f64ba8da28 Gerrit-Change-Number: 17040 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:39 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_SetDataRateAndClockFrequency support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 ) Change subject: PC_to_RDR_SetDataRateAndClockFrequency support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 Gerrit-Change-Number: 17038 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:39:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:50 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_ResetParameters fix In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 ) Change subject: PC_to_RDR_ResetParameters fix ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1d89a704727baa0fd1d14eb6f17809c69cc0df67 Gerrit-Change-Number: 17039 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:39:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:54 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_SetDataRateAndClockFrequency support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 ) Change subject: PC_to_RDR_SetDataRateAndClockFrequency support ...................................................................... PC_to_RDR_SetDataRateAndClockFrequency support Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 --- M ccid_common/ccid_device.c M ccid_common/ccid_device.h M ccid_common/ccid_slot_fsm.c 3 files changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index b14f194..34fdcc8 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -649,7 +649,7 @@ int rc; /* FIXME: which rate to return in failure case? */ - rc = cs->ci->slot_ops->set_rate_and_clock(cs, freq_hz, rate_bps); + rc = cs->ci->slot_ops->set_rate_and_clock(cs, &freq_hz, &rate_bps); if (rc < 0) resp = ccid_gen_clock_and_rate(cs, seq, CCID_CMD_STATUS_FAILED, -rc, 9600, 2500000); else diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h index f364f72..bcf5d12 100644 --- a/ccid_common/ccid_device.h +++ b/ccid_common/ccid_device.h @@ -86,7 +86,7 @@ void (*set_clock)(struct ccid_slot *cs, enum ccid_clock_command cmd); int (*set_params)(struct ccid_slot *cs, uint8_t seq, enum ccid_protocol_num proto, const struct ccid_pars_decoded *pars_dec); - int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps); + int (*set_rate_and_clock)(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps); void (*icc_set_insertion_status)(struct ccid_slot *cs, bool present); int (*handle_fsm_events)(struct ccid_slot *cs, bool enable); }; diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 08cbbad..747fef3 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -323,9 +323,14 @@ return 0; } -static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t freq_hz, uint32_t rate_bps) +static int iso_fsm_slot_set_rate_and_clock(struct ccid_slot *cs, uint32_t* freq_hz, uint32_t* rate_bps) { - /* we always acknowledge all rates/clocks */ + /* we return the currently used values, since we support automatic features */ + struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); + + *rate_bps = card_uart_ctrl(ss->cuart, CUART_CTL_GET_BAUDRATE, false); + *freq_hz = card_uart_ctrl(ss->cuart, CUART_CTL_GET_CLOCK_FREQ, false)/1000; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I96bb11ac7dff0880c56bd4592e9fde900f55f7a1 Gerrit-Change-Number: 17038 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:39:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:39:54 +0000 Subject: Change in osmo-ccid-firmware[master]: PC_to_RDR_ResetParameters fix In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 ) Change subject: PC_to_RDR_ResetParameters fix ...................................................................... PC_to_RDR_ResetParameters fix Change-Id: I1d89a704727baa0fd1d14eb6f17809c69cc0df67 --- M ccid_common/ccid_device.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 34fdcc8..9e72e11 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -480,6 +480,8 @@ /* copy default parameters from somewhere */ /* FIXME: T=1 */ + cs->proposed_pars = *cs->default_pars; + /* validate parameters; abort if they are not supported */ rc = cs->ci->slot_ops->set_params(cs, seq, CCID_PROTOCOL_NUM_T0, cs->default_pars); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I1d89a704727baa0fd1d14eb6f17809c69cc0df67 Gerrit-Change-Number: 17039 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:41:05 +0000 Subject: Change in libosmo-netif[master]: stream: Re-arrange cli states to fix 100% cpu usage bug In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17030 ) Change subject: stream: Re-arrange cli states to fix 100% cpu usage bug ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 Gerrit-Change-Number: 17030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:41:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:41:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:41:43 +0000 Subject: Change in libosmo-netif[master]: stream: Add new WAIT_RECONNECT cli state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17031 ) Change subject: stream: Add new WAIT_RECONNECT cli state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 Gerrit-Change-Number: 17031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:41:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:41:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:41:54 +0000 Subject: Change in libosmo-netif[master]: stream: Drop data during write() while in state NONE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17029 ) Change subject: stream: Drop data during write() while in state NONE ...................................................................... stream: Drop data during write() while in state NONE It should not happen anyway because no fd should be active if state is NONE, but still it's an extra check. Change-Id: I6d58762b7d10078eb8d0981c13d35cb6f85cfe86 --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index fe3de2a..1a38e77 100644 --- a/src/stream.c +++ b/src/stream.c @@ -247,7 +247,7 @@ llist_del(lh); msg = llist_entry(lh, struct msgb, list); - if (cli->state == STREAM_CLI_STATE_CONNECTING) { + if (!osmo_stream_cli_is_connected(cli)) { LOGSCLI(cli, LOGL_ERROR, "not connected, dropping data!\n"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6d58762b7d10078eb8d0981c13d35cb6f85cfe86 Gerrit-Change-Number: 17029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:41:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:41:55 +0000 Subject: Change in libosmo-netif[master]: stream: Re-arrange cli states to fix 100% cpu usage bug In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17030 ) Change subject: stream: Re-arrange cli states to fix 100% cpu usage bug ...................................................................... stream: Re-arrange cli states to fix 100% cpu usage bug With previous state, osmo_stream_cli_close() could be called from osmo_stream_cli_open()(), and in that case state was kept as NONE while ending up with an associated fd being registered in the select loop. As a result, osmo_stream_cli_fd_cb() could be called while in state NONE, which was not expected and would simply return without modifying fd state flags, causing it to be called again and again. Related: OS#4378 Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 --- M src/stream.c 1 file changed, 11 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 1a38e77..c47ae3e 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,9 +129,9 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE = 0, - STREAM_CLI_STATE_CONNECTING = 1, - STREAM_CLI_STATE_CONNECTED = 2, + STREAM_CLI_STATE_NONE = 0, /* No fd associated, may have timer active to try to connect again */ + STREAM_CLI_STATE_CONNECTING = 1, /* Fd associated, but connection not yet confirmed by peer or lower layers */ + STREAM_CLI_STATE_CONNECTED = 2, /* Fd associated and connection is established */ STREAM_CLI_STATE_MAX }; @@ -190,7 +190,6 @@ LOGSCLI(cli, LOGL_INFO, "retrying in %d seconds...\n", cli->reconnect_timeout); osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); - cli->state = STREAM_CLI_STATE_CONNECTING; } /*! \brief Check if Osmocom Stream Client is in connected state @@ -324,7 +323,8 @@ } break; default: - break; + /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */ + osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state); } return 0; } @@ -345,11 +345,10 @@ cli->proto = IPPROTO_TCP; cli->ofd.fd = -1; - cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; cli->ofd.priv_nr = 0; /* XXX */ cli->ofd.cb = osmo_stream_cli_fd_cb; cli->ofd.data = cli; - cli->state = STREAM_CLI_STATE_CONNECTING; + cli->state = STREAM_CLI_STATE_NONE; osmo_timer_setup(&cli->timer, cli_timer_cb, cli); cli->reconnect_timeout = 5; /* default is 5 seconds. */ INIT_LLIST_HEAD(&cli->tx_queue); @@ -583,6 +582,7 @@ return ret; } cli->ofd.fd = ret; + cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE; if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -593,6 +593,7 @@ if (osmo_fd_register(&cli->ofd) < 0) goto error_close_socket; + cli->state = STREAM_CLI_STATE_CONNECTING; return 0; error_close_socket: @@ -653,6 +654,7 @@ return ret; } cli->ofd.fd = ret; + cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE; if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -663,6 +665,7 @@ if (osmo_fd_register(&cli->ofd) < 0) goto error_close_socket; + cli->state = STREAM_CLI_STATE_CONNECTING; return 0; error_close_socket: @@ -676,15 +679,7 @@ struct osmo_stream_cli *cli = data; LOGSCLI(cli, LOGL_DEBUG, "reconnecting.\n"); - - switch(cli->state) { - case STREAM_CLI_STATE_CONNECTING: - cli->ofd.when |= BSC_FD_READ | BSC_FD_WRITE; - osmo_stream_cli_open(cli); - break; - default: - break; - } + osmo_stream_cli_open(cli); } /*! \brief Enqueue data to be sent via an Osmocom stream client -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie3342f882893a71ad1538c17ad9ee9fa4433eaa4 Gerrit-Change-Number: 17030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:41:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:41:55 +0000 Subject: Change in libosmo-netif[master]: stream: Add new WAIT_RECONNECT cli state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17031 ) Change subject: stream: Add new WAIT_RECONNECT cli state ...................................................................... stream: Add new WAIT_RECONNECT cli state It's not really needed right now from logic point of view, since we reused NONE for that. But it makes logging and logic clearer, and will make it easier if we decide to move it to FSMs at a later point in time. Other state value_string names are also modified with its whitespace removed since anyway we'd need to change them to match WAIT_RECONNECT length. Let's drop the space because imho it's not that useful and anyway if we move to FSMs at some point then we won't have them anyway. Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 --- M src/stream.c M tests/stream/stream_test.err 2 files changed, 14 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index c47ae3e..8a063f2 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,16 +129,18 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE = 0, /* No fd associated, may have timer active to try to connect again */ - STREAM_CLI_STATE_CONNECTING = 1, /* Fd associated, but connection not yet confirmed by peer or lower layers */ - STREAM_CLI_STATE_CONNECTED = 2, /* Fd associated and connection is established */ + STREAM_CLI_STATE_NONE, /* No fd associated, no timer active */ + STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */ + STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */ + STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */ STREAM_CLI_STATE_MAX }; static const struct value_string stream_cli_state_names[] = { - { STREAM_CLI_STATE_NONE, " NONE" }, - { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, - { STREAM_CLI_STATE_CONNECTED, " CONNECTED" }, + { STREAM_CLI_STATE_NONE, "NONE" }, + { STREAM_CLI_STATE_WAIT_RECONNECT, "WAIT_RECONNECT" }, + { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, + { STREAM_CLI_STATE_CONNECTED, "CONNECTED" }, { 0, NULL } }; @@ -187,6 +189,7 @@ return; } + cli->state = STREAM_CLI_STATE_WAIT_RECONNECT; LOGSCLI(cli, LOGL_INFO, "retrying in %d seconds...\n", cli->reconnect_timeout); osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); @@ -669,6 +672,7 @@ return 0; error_close_socket: + cli->state = STREAM_CLI_STATE_NONE; close(cli->ofd.fd); cli->ofd.fd = -1; return -EIO; diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 04bfcfe..69a0b85 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -12,8 +12,8 @@ {2.000006} autoreconnecting test step 6 [client OK, server OK], FD reg 1 {2.000007} autoreconnecting test step 5 [client OK, server OK], FD reg 1 -[ CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[ NONE] osmo_stream_cli_reconnect(): retrying in 9 seconds... +[CONNECTED] osmo_stream_cli_recv(): connection closed with srv +[WAIT_RECONNECT] osmo_stream_cli_reconnect(): retrying in 9 seconds... {11.000008} autoreconnecting test step 4 [client OK, server OK], FD reg 0 @@ -37,7 +37,7 @@ {11.000017} non-reconnecting test step 2 [client OK, server OK], FD reg 1 {11.000018} non-reconnecting test step 1 [client OK, server OK], FD reg 1 -[ CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[ NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. +[CONNECTED] osmo_stream_cli_recv(): connection closed with srv +[NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7b9a6da87081c418b0d14bab5f34369c5eca6fe8 Gerrit-Change-Number: 17031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:42:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:42:07 +0000 Subject: Change in libosmo-netif[master]: stream: Rename cli state NONE to CLOSED In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17032 ) Change subject: stream: Rename cli state NONE to CLOSED ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic02aec3f7f095e0e0e1f940425f577be5048e98f Gerrit-Change-Number: 17032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:42:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:42:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:42:12 +0000 Subject: Change in libosmo-netif[master]: stream: Rename cli state NONE to CLOSED In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17032 ) Change subject: stream: Rename cli state NONE to CLOSED ...................................................................... stream: Rename cli state NONE to CLOSED It makes a lot more sense calling it this way since it matches the state of the stream at that point. Change-Id: Ic02aec3f7f095e0e0e1f940425f577be5048e98f --- M src/stream.c M tests/stream/stream_test.err 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 8a063f2..65532d3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,7 +129,7 @@ */ enum osmo_stream_cli_state { - STREAM_CLI_STATE_NONE, /* No fd associated, no timer active */ + STREAM_CLI_STATE_CLOSED, /* No fd associated, no timer active */ STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */ STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */ STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */ @@ -137,7 +137,7 @@ }; static const struct value_string stream_cli_state_names[] = { - { STREAM_CLI_STATE_NONE, "NONE" }, + { STREAM_CLI_STATE_CLOSED, "CLOSED" }, { STREAM_CLI_STATE_WAIT_RECONNECT, "WAIT_RECONNECT" }, { STREAM_CLI_STATE_CONNECTING, "CONNECTING" }, { STREAM_CLI_STATE_CONNECTED, "CONNECTED" }, @@ -221,7 +221,7 @@ cli->disconnect_cb(cli); } - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; } static void osmo_stream_cli_read(struct osmo_stream_cli *cli) @@ -351,7 +351,7 @@ cli->ofd.priv_nr = 0; /* XXX */ cli->ofd.cb = osmo_stream_cli_fd_cb; cli->ofd.data = cli; - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; osmo_timer_setup(&cli->timer, cli_timer_cb, cli); cli->reconnect_timeout = 5; /* default is 5 seconds. */ INIT_LLIST_HEAD(&cli->tx_queue); @@ -672,7 +672,7 @@ return 0; error_close_socket: - cli->state = STREAM_CLI_STATE_NONE; + cli->state = STREAM_CLI_STATE_CLOSED; close(cli->ofd.fd); cli->ofd.fd = -1; return -EIO; diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 69a0b85..0d08c67 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -38,6 +38,6 @@ {11.000018} non-reconnecting test step 1 [client OK, server OK], FD reg 1 [CONNECTED] osmo_stream_cli_recv(): connection closed with srv -[NONE] osmo_stream_cli_reconnect(): not reconnecting, disabled. +[CLOSED] osmo_stream_cli_reconnect(): not reconnecting, disabled. {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic02aec3f7f095e0e0e1f940425f577be5048e98f Gerrit-Change-Number: 17032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:44:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:44:05 +0000 Subject: Change in osmo-ccid-firmware[master]: Implement serial number string descriptor in CTRL EP callback In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 ) Change subject: Implement serial number string descriptor in CTRL EP callback ...................................................................... Patch Set 4: (1 comment) @Hoernchen, can you take this over? https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521/4/sysmoOCTSIM/usb_start.c File sysmoOCTSIM/usb_start.c: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521/4/sysmoOCTSIM/usb_start.c at 78 PS4, Line 78: printf("Sending string %u from callback: ", req->wValue & 0x00ff); : printf("ep=0x%02x len_req=%u len_desc=%u, len_tx=%u, zlp=%u\r\n", do we want to have unconditional printf's in this code? Sure, it was useful during debug, but do we want it now? -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I428972df2cd35c4a5d9774c8ca8ece5109927fa9 Gerrit-Change-Number: 16521 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:44:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:45:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:45:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 21:45:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:45:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:45:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Tue, 28 Jan 2020 21:45:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:45:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:45:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 ) Change subject: SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd ...................................................................... SGSN_Tests: Wait for RAU Accept after receiving SecurityModeCmd We don't want to pass the test or return from this function before receiving a RAU accept. With Iu we expect a Security Mode Command/Complete before the routing area is updated, but we do want to wait for the actual RAU Accept or fail when receiving a RAU Reject. Change-Id: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Related: OS#3727 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 800c978..eb1fff2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2409,6 +2409,7 @@ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))) + repeat; } [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } [is_iu(ran_index)] BSSAP.receive { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16983 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: Id89e2c6dae8cbdb5e8dee1c92960dc3346590a95 Gerrit-Change-Number: 16983 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:45:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:45:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 ) Change subject: SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash ...................................................................... SGSN_Tests_Iu: Enable Iu tests that made the SGSN crash Depends: osmo-sgsn I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Change-Id: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Related: OS#3727 --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 786961f..2b63b4e 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -85,9 +85,8 @@ control { execute( TC_iu_attach() ); - /* FIXME: will crash the sgsn - * execute( TC_iu_attach_geran_rau() ); - * execute( TC_geran_attach_iu_rau() ); */ + execute( TC_iu_attach_geran_rau() ); + execute( TC_geran_attach_iu_rau() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16984 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: I96851c7c06c8f95ad280a275c2b83d825f0c88cb Gerrit-Change-Number: 16984 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:48:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:48:43 +0000 Subject: Change in osmo-asf4-dfu[master]: usb serial number descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 ) Change subject: usb serial number descriptor ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024/2/usb_start.c File usb_start.c: https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024/2/usb_start.c at 121 PS2, Line 121: SYSMOOCTSIM why have this specifically to SYSMOOCTSIM? I think this is a generic feature that should work for all boards based on the same chip, actually possibly even for all boards using the same family of chips? So I would say the proper way to introduce this is to have a chip-specific HAVE_CHIP_UNIQUE_ID or so, and then provide a chip-specific library function to obtain that unique number, which can be used here? Doesn't sound like all that much effort, and will help us with the next board using this codebase. -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da Gerrit-Change-Number: 17024 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:48:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:49:52 +0000 Subject: Change in osmo-ccid-firmware[master]: support DFU detach to switch from fw to bootloader In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 ) Change subject: support DFU detach to switch from fw to bootloader ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I04d05054d1c0e3988b8eafd93c6524f4a0489cb7 Gerrit-Change-Number: 17034 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:51:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:51:32 +0000 Subject: Change in osmo-ccid-firmware[master]: git version appended to the product usb string descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 ) Change subject: git version appended to the product usb string descriptor ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035/2/sysmoOCTSIM/main.c File sysmoOCTSIM/main.c: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035/2/sysmoOCTSIM/main.c at 369 PS2, Line 369: if(2+in_sz*2 < out_sz) if only if() was a function, or for(),... It is of course a waste of all of our time to go through review cycles because of it, but I would like to kindly ask you to try to observe coding style before pushing to gerrit. Thanks :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 Gerrit-Change-Number: 17035 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:51:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 21:52:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jan 2020 21:52:30 +0000 Subject: Change in osmo-ccid-firmware[master]: usb dfu header cleanup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 ) Change subject: usb dfu header cleanup ...................................................................... Patch Set 1: (1 comment) commit log could be a bit more verbose why this is done, ... https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037/1/sysmoOCTSIM/usb/class/dfu/device/dfudf.c File sysmoOCTSIM/usb/class/dfu/device/dfudf.c: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037/1/sysmoOCTSIM/usb/class/dfu/device/dfudf.c at 67 PS1, Line 67: 0xfe how is the magic value an improvement over a #define? -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d Gerrit-Change-Number: 17037 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jan 2020 21:52:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 23:28:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 23:28:37 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jan 2020 23:28:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 23:34:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 23:34:18 +0000 Subject: Change in osmo-pcu[master]: gsm_timer: fix comparison of constant LONG_MAX with an integer In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17006 ) Change subject: gsm_timer: fix comparison of constant LONG_MAX with an integer ...................................................................... gsm_timer: fix comparison of constant LONG_MAX with an integer It does not make sense since INT_MAX is always less than LONG_MAX. Found by Clang [-Wtautological-constant-out-of-range-compare]. Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 --- M src/gsm_timer.cpp 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gsm_timer.cpp b/src/gsm_timer.cpp index f7901d4..cefe520 100644 --- a/src/gsm_timer.cpp +++ b/src/gsm_timer.cpp @@ -144,17 +144,14 @@ static void update_nearest(int *cand, int *current) { - if (*cand != LONG_MAX) { - if (*cand > *current) - nearest = *cand - *current; - else { - /* loop again inmediately */ - nearest = 0; - } - nearest_p = &nearest; - } else { - nearest_p = NULL; + if (*cand > *current) + nearest = *cand - *current; + else { + /* loop again inmediately */ + nearest = 0; } + + nearest_p = &nearest; } /* -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9934e05aa050bf93b3c795376f5dca3a848a7e11 Gerrit-Change-Number: 17006 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 23:34:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 23:34:19 +0000 Subject: Change in osmo-pcu[master]: encoding: fix log_alert_exit(): do not treat error as format string In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17008 ) Change subject: encoding: fix log_alert_exit(): do not treat error as format string ...................................................................... encoding: fix log_alert_exit(): do not treat error as format string This is rather a cosmetic change aimed to make ASAN / Coverity happy. In general, we never pass any input from an untrusted source. Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 --- M src/encoding.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 8c3aaed..23b35bd 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -432,7 +432,7 @@ static inline void log_alert_exit(const char * error) { - LOGP(DRLCMACUL, LOGL_ERROR, error); + LOGP(DRLCMACUL, LOGL_ERROR, "%s", error); pcu_tx_txt_ind(PCU_OML_ALERT, error); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I26d654da4c3bf5fd86a298c3027fd9820c932308 Gerrit-Change-Number: 17008 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jan 28 23:34:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jan 2020 23:34:21 +0000 Subject: Change in osmo-pcu[master]: tests/alloc: fix implicit conversion from 'double' to 'int8_t' In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17009 ) Change subject: tests/alloc: fix implicit conversion from 'double' to 'int8_t' ...................................................................... tests/alloc: fix implicit conversion from 'double' to 'int8_t' Looks pretty much like a typo. Both '-1' and '.' symbols are neighbours in QWERTZ keyboard layout, so it must be -1. Found by Clang [-Wliteral-conversion]. Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b --- M tests/alloc/AllocTest.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 123f879..2fdee3f 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -309,7 +309,7 @@ tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0, false); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, false); if (!ul_tbf) return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id4eb2dcc3b44e18096c7b94efb7260e2400c596b Gerrit-Change-Number: 17009 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 01:16:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jan 2020 01:16:32 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 26: Code-Review-1 (18 comments) It took me about one hour to review this change. And now I noticed 1/2 in the title. Some of my comments are critical (e.g. memleaks), some are not. I don't like something that was supposed to be merged as a feature changes the code base that much. Most of the handover-related bomb changes to OsmoMSC I had a pleasure to review made the code more flexible, while this one makes it more complicated. Especially that part with const req->gsup (decoded message) and the way how instances of osmo_gsup_req are supposed to be free()d. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 82 PS26, Line 82: osmo_gsup_message_to_str_c Do we really need such detailed logging? Not sure if this supposed to happen too often. One can always use gdb to inspect the contents of structures... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 89 PS26, Line 89: osmo_gsup_message_to_str_c Same here. Chances are that this message would confuse the end user... Printing just a message type would be enough IMHO. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 104 PS26, Line 104: GSUP message I think you can print the message type since osmo_gsup_req_new() decodes it for you. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 109 PS26, Line 109: return NULL; Shouldn't we call osmo_gsup_req_free() here? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 428 PS26, Line 428: ws https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 444 PS26, Line 444: osmo_gsup_create_insert_subscriber_data_msg I don't see any functional changes to this function, you're basically converting tabs to spaces... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_client.c at 294 PS26, Line 294: ipa_client_conn_create2 Should be easy to submit this as a separate change. You're basically fixing a deprecation warning here... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c File src/gsupclient/gsup_req.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 110 PS26, Line 110: msgb_free(req->msg); BTW: you could just do talloc_steal(req, msg) in osmo_gsup_req_new(). As a bonus, we would get cleaner hierarchy in the talloc reports. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 129 PS26, Line 129: !req->send_response_cb Do we expect to have an instance of osmo_gsup_req without the response cb? If not, just add an assert(send_response_cb != NULL) to osmo_gsup_req_new(). https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 142 PS26, Line 142: osmo_gsup_req_free I would better avoid doing the cleanup here and leave it up to the caller. Yes, it helps to avoid code duplication, but at the same time makes it harder to spot bugs. It's just one line of code after all. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 165 PS26, Line 165: osmo_gsup_req_free Same here. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr.c at 447 PS26, Line 447: req->gsup.source_name[0] The source_name is a pointer (not a buffer) and it can be NULL. Remove [0]. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr.c at 448 PS26, Line 448: destination_name Same. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c File src/hlr_ussd.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 255 PS26, Line 255: return rc; memleak, add talloc_free(msg) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 284 PS26, Line 284: struct osmo_gsup_message resp = { : .message_type = gsup_msg_type, : .session_id = ss->session_id, : }; I am sorry, but what's the point of this change? Just to make everything in the code use your favorite way of initializing structures? Don't get me wrong, I am not against using this in the new code, or where you're actually changing something (e.g. adding new fields). But this patch is already quite big, and such changes don't make it easier to read... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 474 PS26, Line 474: sending might modify some (routing related?) parts That's odd, I would even say unacceptable. A "*_send" function is not supposed to change anything by definition and should accept a const pointer. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 499 PS26, Line 499: return 0; No need, we return 0 below anyway. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/tests/testsuite.at File tests/testsuite.at: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/tests/testsuite.at at 22 PS26, Line 22: experr This file is empty, you could just use 'ignore'. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 01:16:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 01:20:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jan 2020 01:20:45 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 26: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 109 PS26, Line 109: return NULL; > Shouldn't we call osmo_gsup_req_free() here? Ok, now (after spending an hour reading the code) I know that osmo_gsup_req_respond_msgt() can also free() req. So we should not. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 01:20:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 01:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jan 2020 01:32:35 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 01:32:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 01:33:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jan 2020 01:33:36 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: remove cruft In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16460 ) Change subject: test_nodes.vty: remove cruft ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 Gerrit-Change-Number: 16460 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 01:33:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jan 29 02:24:48 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 29 Jan 2020 02:24:48 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5e30ecfb55fcf_2dd02b1d355b65f872398@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Raspbian_10/armv7l Package network:osmocom:nightly/limesuite failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 612s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlGPIO.cpp.o -c /usr/src/packages/BUILD/src/boards_wxgui/pnlGPIO.cpp [ 613s] [ 80%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o [ 613s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_gui.cpp [ 617s] [ 80%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o [ 617s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_wxgui.cpp [ 625s] [ 81%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o [ 625s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_cmd.cpp [ 637s] [ 82%] Linking CXX executable ../bin/LimeSuiteGUI [ 637s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/LimeSuiteGUI.dir/link.txt --verbose=1 [ 637s] /usr/bin/c++ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -Wl,-z,relro -rdynamic CMakeFiles/LimeSuiteGUI.dir/ADF4002/ADF4002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlXBUF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCalibrations_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTRF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCDS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLimeLightPAD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIST_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewIRAM.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_gui_utilities.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlSX_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgVCOfrequencies.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLDO_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlAFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlGains_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/CoefficientFileParser.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_mainPanel.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewSFR.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCLKGEN_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlMCU_BD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIAS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgGFIR_Coefficients.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlR3.cpp.o CMakeFiles/LimeSuiteGUI.dir/LMS_Programing/LMS_Programing_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgConnectionSettings.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlMiniLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlAPI.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/SPI_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgFullMessageLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgDeviceInfo.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/utilities_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteAppFrame.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/RFSpark_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/Si5351C/Si5351C_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp.cpp.o CMakeFiles/LimeSuiteGUI.dir/FPGAcontrols_wxgui/FPGAcontrols_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/dlgAbout.cpp.o CMakeFiles/LimeSuiteGUI.dir/numericSlider/numericSlider.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_frFFTviewer.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteEvents/lms7suiteEvents.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBoardControls.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlQSpark.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnluLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlUltimateEVB.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBuffers.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlCoreSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeNetMicro.cpp.o CMakeFiles/LimeSuiteGUI.dir/__/external/kissFFT/kiss_fft.c.o CMakeFiles/LimeSuiteGUI.dir/windowFunction.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlGPIO.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o -o ../bin/LimeSuiteGUI -Wl,-rpath,/usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src: libLimeSuite.so.20.01.0 oglGraph/liboglGraph.a -L/usr/lib/arm-linux-gnueabihf -pthread -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 -lusb-1.0 -lGL -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 [ 642s] /usr/bin/ld: libLimeSuite.so.20.01.0: undefined reference to `__atomic_store_8' [ 642s] /usr/bin/ld: libLimeSuite.so.20.01.0: undefined reference to `__atomic_load_8' [ 642s] collect2: error: ld returned 1 exit status [ 642s] make[3]: *** [src/CMakeFiles/LimeSuiteGUI.dir/build.make:990: bin/LimeSuiteGUI] Error 1 [ 642s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 642s] make[2]: *** [CMakeFiles/Makefile2:142: src/CMakeFiles/LimeSuiteGUI.dir/all] Error 2 [ 642s] make[2]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 642s] make[1]: *** [Makefile:133: all] Error 2 [ 642s] make[1]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 642s] dh_auto_build: cd obj-arm-linux-gnueabihf && make -j4 returned exit code 2 [ 642s] make: *** [debian/rules:28: binary] Error 2 [ 642s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 642s] [ 642s] armbuild04 failed "build limesuite_20.01.0-1.dsc" at Wed Jan 29 02:24:33 UTC 2020. [ 642s] [ 642s] ### VM INTERACTION START ### [ 645s] [ 616.173543] sysrq: SysRq : Power Off [ 645s] [ 616.207233] reboot: Power down [ 645s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:01:52 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 08:01:52 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... Patch Set 12: Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 08:01:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:01:58 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 08:01:58 +0000 Subject: Change in libosmo-abis[master]: add ipa ping/pong keepalive for OML/RSL links between bts and bsc In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/14743 ) Change subject: add ipa ping/pong keepalive for OML/RSL links between bts and bsc ...................................................................... add ipa ping/pong keepalive for OML/RSL links between bts and bsc Patch-by: ewild, osmith Related: OS#4070 Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Depends: (libosmo-abis) Ie453fdee8bfd7fc1a3f1ed67ef0331f0abb1d59b --- M TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 204 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..e2f62ef 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-abis API change major: add parameter to struct e1inp_line diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 00b4aaa..4362f50 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -123,6 +123,8 @@ struct { /* ip.access driver has one fd for each ts */ struct osmo_fd fd; + /* ipa keep-alive */ + struct osmo_fsm_inst* ka_fsm; } ipaccess; struct { /* DAHDI driver has one fd for each ts */ @@ -197,11 +199,14 @@ char *sock_path; struct rate_ctr_group *rate_ctr; - /* keepalive configuration */ + /* tcp keepalive configuration */ int keepalive_num_probes; /* 0: disable, num, or E1INP_USE_DEFAULT */ int keepalive_idle_timeout; /* secs, or E1INP_USE_DEFAULT */ int keepalive_probe_interval; /* secs or E1INP_USE_DEFAULT */ + /* ipa ping/pong keepalive params */ + struct ipa_keepalive_params *ipa_kap; + /* array of timestlots */ struct e1inp_ts ts[NUM_E1_TS]; unsigned int num_ts; diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index a1943e6..8d89d04 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -38,6 +38,7 @@ #include #include +#include /* CONFIG */ @@ -169,6 +170,47 @@ return set_keepalive_params(vty, atoi(argv[0]), 0, 0, 0); } +#define IPA_KEEPALIVE_HELP "Enable IPA PING/PONG keep-alive\n" +static int set_ipa_keepalive_params(struct vty *vty, int e1_nr, int interval, int wait_for_resp) +{ + struct e1inp_line *line = e1inp_line_find(e1_nr); + + if (!line) { + vty_out(vty, "%% Line %d doesn't exist%s", e1_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + if (strcmp(line->driver->name, "ipa") != 0) { + vty_out(vty, "%% Line %d doesn't use the ipa driver%s", e1_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + TALLOC_FREE(line->ipa_kap); + if (interval) { + line->ipa_kap = talloc_zero(line, struct ipa_keepalive_params); + line->ipa_kap->wait_for_resp = wait_for_resp; + line->ipa_kap->interval = interval; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_e1line_ipa_keepalive, cfg_e1_line_ipa_keepalive_cmd, + "e1_line <0-255> ipa-keepalive <1-300> <1-300>", + E1_LINE_HELP IPA_KEEPALIVE_HELP + "Idle interval in seconds before probes are sent\n" + "Time to wait for PONG response\n") +{ + return set_ipa_keepalive_params(vty, atoi(argv[0]), atoi(argv[1]), atoi(argv[2])); +} + +DEFUN(cfg_e1line_no_ipa_keepalive, cfg_e1_line_no_ipa_keepalive_cmd, + "no e1_line <0-255> ipa-keepalive", + NO_STR E1_LINE_HELP IPA_KEEPALIVE_HELP) +{ + return set_ipa_keepalive_params(vty, atoi(argv[0]), 0, 0); +} + DEFUN(cfg_e1line_name, cfg_e1_line_name_cmd, "e1_line <0-255> name .LINE", E1_LINE_HELP "Set name for this line\n" "Human readable name\n") @@ -242,7 +284,10 @@ line->keepalive_num_probes, line->keepalive_probe_interval, VTY_NEWLINE); - + if (line->ipa_kap) + vty_out(vty, " e1_line %u ipa-keepalive %d %d%s", line->num, + line->ipa_kap->interval, line->ipa_kap->wait_for_resp, + VTY_NEWLINE); } const char *ipa_bind = e1inp_ipa_get_bind_addr(); @@ -398,6 +443,8 @@ install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_cmd); install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd); install_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd); + install_element(L_E1INP_NODE, &cfg_e1_line_ipa_keepalive_cmd); + install_element(L_E1INP_NODE, &cfg_e1_line_no_ipa_keepalive_cmd); install_element(L_E1INP_NODE, &cfg_ipa_bind_cmd); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9eff2f1..e1936af 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -59,14 +59,31 @@ #define DEFAULT_TCP_KEEPALIVE_INTERVAL 3 #define DEFAULT_TCP_KEEPALIVE_RETRY_COUNT 10 +static inline struct e1inp_ts *ipaccess_line_ts(struct osmo_fd *bfd, struct e1inp_line *line) +{ + if (bfd->priv_nr == E1INP_SIGN_OML) + return e1inp_line_ipa_oml_ts(line); + else + return e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); +} + +static inline void ipaccess_keepalive_fsm_cleanup(struct e1inp_ts *e1i_ts) +{ + struct osmo_fsm_inst *ka_fsm; + + ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; + if (ka_fsm) { + ipa_keepalive_fsm_stop(ka_fsm); + e1i_ts->driver.ipaccess.ka_fsm = NULL; + } +} + static int ipaccess_drop(struct osmo_fd *bfd, struct e1inp_line *line) { int ret = 1; - struct e1inp_ts *e1i_ts; - if (bfd->priv_nr == E1INP_SIGN_OML) - e1i_ts = e1inp_line_ipa_oml_ts(line); - else - e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); + struct e1inp_ts *e1i_ts = ipaccess_line_ts(bfd, line); + + ipaccess_keepalive_fsm_cleanup(e1i_ts); /* Error case: we did not see any ID_RESP yet for this socket. */ if (bfd->fd != -1) { @@ -87,6 +104,80 @@ return ret; } +static void ipa_bsc_keepalive_write_server_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) +{ + struct osmo_fd *bfd = (struct osmo_fd *)conn; + write(bfd->fd, msg->data, msg->len); + msgb_free(msg); +} + +static int ipa_bsc_keepalive_timeout_cb(struct osmo_fsm_inst *fi, void *data) +{ + struct osmo_fd *bfd = (struct osmo_fd *)data; + + if (bfd->fd == -1) + return 1; + + ipaccess_drop(bfd, (struct e1inp_line *)bfd->data); + return 1; +} + +static void ipaccess_bsc_keepalive_fsm_alloc(struct e1inp_ts *e1i_ts, struct osmo_fd *bfd, const char *id) +{ + struct e1inp_line *line = e1i_ts->line; + struct osmo_fsm_inst *ka_fsm; + + ipaccess_keepalive_fsm_cleanup(e1i_ts); + if (!line->ipa_kap) + return; + + ka_fsm = ipa_generic_conn_alloc_keepalive_fsm(tall_ipa_ctx, bfd, line->ipa_kap, id); + e1i_ts->driver.ipaccess.ka_fsm = ka_fsm; + if (!ka_fsm) + return; + + ipa_keepalive_fsm_set_timeout_cb(ka_fsm, ipa_bsc_keepalive_timeout_cb); + ipa_keepalive_fsm_set_send_cb(ka_fsm, ipa_bsc_keepalive_write_server_cb); + ipa_keepalive_fsm_start(ka_fsm); +} + +static void ipa_bts_keepalive_write_client_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) { + struct ipa_client_conn *link = (struct ipa_client_conn *)conn; + int ret = 0; + + ret = ipa_send(link->ofd->fd, msg->data, msg->len); + if (ret != msg->len) { + LOGP(DLINP, LOGL_ERROR, "cannot send message. Reason: %s\n", strerror(errno)); + } + msgb_free(msg); +} + +static void update_fd_settings(struct e1inp_line *line, int fd); +static void ipaccess_bts_updown_cb(struct ipa_client_conn *link, int up); + +static int ipa_bts_keepalive_timeout_cb(struct osmo_fsm_inst *fi, void *conn) { + ipaccess_bts_updown_cb(conn, false); + return 1; +} + +static void ipaccess_bts_keepalive_fsm_alloc(struct e1inp_ts *e1i_ts, struct ipa_client_conn *client, const char *id) +{ + struct e1inp_line *line = e1i_ts->line; + struct osmo_fsm_inst *ka_fsm; + + ipaccess_keepalive_fsm_cleanup(e1i_ts); + if (!line->ipa_kap) + return; + + ka_fsm = ipa_client_conn_alloc_keepalive_fsm(client, line->ipa_kap, id); + e1i_ts->driver.ipaccess.ka_fsm = ka_fsm; + if (!ka_fsm) + return; + + ipa_keepalive_fsm_set_timeout_cb(ka_fsm, ipa_bts_keepalive_timeout_cb); + ipa_keepalive_fsm_set_send_cb(ka_fsm, ipa_bts_keepalive_write_client_cb); +} + /* Returns -1 on error, and 0 or 1 on success. If -1 or 1 is returned, line has * been released and should not be used anymore by the caller. */ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg, @@ -98,6 +189,14 @@ struct e1inp_sign_link *sign_link; char *unitid; int len, ret; + struct e1inp_ts *e1i_ts; + struct osmo_fsm_inst *ka_fsm; + + /* peek the pong for our keepalive fsm */ + e1i_ts = ipaccess_line_ts(bfd, line); + ka_fsm = e1i_ts->driver.ipaccess.ka_fsm; + if (ka_fsm && msg_type == IPAC_MSGT_PONG) + ipa_keepalive_fsm_pong_received(ka_fsm); /* Handle IPA PING, PONG and ID_ACK messages. */ ret = ipa_ccm_rcvmsg_base(msg, bfd); @@ -165,9 +264,12 @@ "closing socket.\n"); goto err; } + + ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, bfd, "oml_bsc_to_bts"); + } else if (bfd->priv_nr == E1INP_SIGN_RSL) { struct e1inp_ts *ts; - struct osmo_fd *newbfd; + struct osmo_fd *newbfd; struct e1inp_line *new_line; sign_link = @@ -209,6 +311,9 @@ } /* now we can release the dummy RSL line. */ e1inp_line_put(line); + + e1i_ts = ipaccess_line_ts(newbfd, new_line); + ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); return 1; } break; @@ -238,11 +343,7 @@ struct msgb *msg = NULL; int ret, rc; - if (bfd->priv_nr == E1INP_SIGN_OML) - e1i_ts = e1inp_line_ipa_oml_ts(line); - else - e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); - + e1i_ts = ipaccess_line_ts(bfd, line); ret = ipa_msg_recv_buffered(bfd->fd, &msg, &e1i_ts->pending_msg); if (ret < 0) { if (ret == -EAGAIN) @@ -312,6 +413,17 @@ { struct e1inp_ts *e1i_ts = sign_link->ts; struct osmo_fd *bfd = &e1i_ts->driver.ipaccess.fd; + struct e1inp_line *line = e1i_ts->line; + + /* line might not exist if != bsc||bts */ + if (line) { + /* depending on caller the fsm might be dead */ + struct osmo_fsm_inst* ka_fsm = ipaccess_line_ts(bfd, line)->driver.ipaccess.ka_fsm; + if (ka_fsm) + ipa_keepalive_fsm_stop(ka_fsm); + + } + return e1inp_close_socket(e1i_ts, sign_link, bfd); } @@ -331,11 +443,7 @@ struct msgb *msg; int ret; - if (bfd->priv_nr == E1INP_SIGN_OML) - e1i_ts = e1inp_line_ipa_oml_ts(line); - else - e1i_ts = e1inp_line_ipa_rsl_ts(line, bfd->priv_nr - E1INP_SIGN_RSL); - + e1i_ts = ipaccess_line_ts(bfd, line); bfd->when &= ~BSC_FD_WRITE; /* get the next msg for this timeslot */ @@ -378,6 +486,7 @@ msgb_free(msg); return ret; err: + ipaccess_keepalive_fsm_cleanup(e1i_ts); ipaccess_drop(bfd, line); msgb_free(msg); return ret; @@ -684,10 +793,14 @@ { struct e1inp_line *line = link->line; - if (up) { - update_fd_settings(line, link->ofd->fd); - return; - } + if (up) { + struct osmo_fsm_inst *ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; + + update_fd_settings(line, link->ofd->fd); + if (ka_fsm && line->ipa_kap) + ipa_keepalive_fsm_start(ka_fsm); + return; + } if (line->ops->sign_link_down) line->ops->sign_link_down(line); @@ -701,10 +814,19 @@ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; struct msgb *rmsg; int ret = 0; + /* line might not exist if != bsc||bts */ + struct e1inp_line *line = link->line; /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { uint8_t msg_type = *(msg->l2h); + struct osmo_fsm_inst* ka_fsm = NULL; + + /* peek the pong for our keepalive fsm */ + if (line && msg_type == IPAC_MSGT_PONG) { + ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; + ipa_keepalive_fsm_pong_received(ka_fsm); + } /* ping, pong and acknowledgment cases. */ ret = ipa_ccm_rcvmsg_bts_base(msg, link->ofd); @@ -895,6 +1017,7 @@ } case E1INP_LINE_R_BTS: { struct ipa_client_conn *link; + struct e1inp_ts *e1i_ts; LOGP(DLINP, LOGL_NOTICE, "enabling ipaccess BTS mode, " "OML connecting to %s:%u\n", line->ops->cfg.ipa.addr, @@ -922,6 +1045,9 @@ ipa_client_conn_destroy(link); return -EIO; } + + e1i_ts = e1inp_line_ipa_oml_ts(line); + ipaccess_bts_keepalive_fsm_alloc(e1i_ts, link, "oml_bts_to_bsc"); ret = 0; break; } @@ -944,6 +1070,7 @@ uint8_t trx_nr) { struct ipa_client_conn *rsl_link; + struct e1inp_ts *e1i_ts = e1inp_line_ipa_rsl_ts(line, trx_nr); if (E1INP_SIGN_RSL+trx_nr-1 >= NUM_E1_TS) { LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " @@ -972,6 +1099,8 @@ ipa_client_conn_destroy(rsl_link); return -EIO; } + + ipaccess_bts_keepalive_fsm_alloc(e1i_ts, rsl_link, "rsl_bts_to_bsc"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/14743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30e3bd601e55355aaf738ee2f2c44c1ec2c46c6a Gerrit-Change-Number: 14743 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Assignee: osmith Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:06:01 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 08:06:01 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Wed, 29 Jan 2020 08:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:18:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jan 2020 08:18:21 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Wed, 29 Jan 2020 08:18:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:21:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jan 2020 08:21:23 +0000 Subject: Change in osmo-bsc[master]: OM2000: Add some more message types and IEs we now understand References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17054 ) Change subject: OM2000: Add some more message types and IEs we now understand ...................................................................... OM2000: Add some more message types and IEs we now understand OM2000 is not only used for the venerable RBS2000 family, but also for the more modern RBS6000 family, specifically the DUG 20 GSM baseband unit. In RBS6000, there are some protocol extensions which are not yet fully understood. However, we are understanding some bits around the MCTR (multi carrier transceiver?), a new MO that appears to be present for every physical RUS (Radio Unit) attached to the DUG 20. Let's add what we have learned so far. Thanks to Sylvain Munaut for his help with this. Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 --- M include/osmocom/bsc/abis_om2000.h M src/osmo-bsc/abis_om2000.c 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/17054/1 diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h index b093a03..49e8510 100644 --- a/include/osmocom/bsc/abis_om2000.h +++ b/include/osmocom/bsc/abis_om2000.h @@ -29,6 +29,7 @@ OM2K_MO_CLS_IS = 0x05, OM2K_MO_CLS_CON = 0x06, OM2K_MO_CLS_DP = 0x07, + OM2K_MO_CLS_MCTR = 0x08, OM2K_MO_CLS_CF = 0x0a, OM2K_MO_CLS_TX = 0x0b, OM2K_MO_CLS_RX = 0x0c, diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 14c373b..f8efa39 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -202,6 +202,26 @@ OM2K_MSGT_NEGOT_REQ_ACK = 0x0104, OM2K_MSGT_NEGOT_REQ_NACK = 0x0105, OM2K_MSGT_NEGOT_REQ = 0x0106, + + OM2K_MSGT_BTS_INITIATED_REQ_ACK = 0x0108, + OM2K_MSGT_BTS_INITIATED_REQ_NACK = 0x0109, + OM2K_MSGT_BTS_INITIATED_REQ = 0x010a, + + OM2K_MSGT_RADIO_CHAN_REL_CMD = 0x010c, + OM2K_MSGT_RADIO_CHAN_REL_COMPL = 0x010e, + OM2K_MSGT_RADIO_CHAN_REL_REJ = 0x010f, + + OM2K_MSGT_FEATURE_CTRL_CMD = 0x0118, + OM2K_MSGT_FEATURE_CTRL_COMPL = 0x011a, + OM2K_MSGT_FEATURE_CTRL_REJ = 0x011b, + + OM2K_MSGT_MCTR_CONFIG_REQ = 0x012c, + OM2K_MSGT_MCTR_CONFIG_REQ_ACK = 0x012e, + OM2K_MSGT_MCTR_CONFIG_REQ_REJ = 0x012f, + + OM2K_MSGT_MCTR_CONFIG_RES_ACK = 0x0130, + OM2K_MSGT_MCTR_CONFIG_RES_NACK = 0x0131, + OM2K_MSGT_MCTR_CONFIG_RES = 0x0132, }; enum abis_om2k_dei { @@ -272,6 +292,13 @@ OM2K_DEI_FS_OFFSET = 0x98, OM2K_DEI_EXT_COND_MAP_2_EXT = 0x9c, OM2K_DEI_TSS_MO_STATE = 0x9d, + OM2K_DEI_CONFIG_TYPE = 0x9e, + OM2K_DEI_JITTER_SIZE = 0x9f, + OM2K_DEI_PACKING_ALGO = 0xa0, + OM2K_DEI_TRXC_LIST = 0xa8, + OM2K_DEI_MAX_ALLOWED_POWER = 0xa9, + OM2K_DEI_MAX_ALLOWED_NUM_TRXCS = 0xaa, + OM2K_DEI_MCTR_FEAT_STATUS_BMAP = 0xab, }; const struct tlv_definition om2k_att_tlvdef = { @@ -521,6 +548,12 @@ { 0x0118, "Feature Control Command" }, { 0x011a, "Feature Control Complete" }, { 0x011b, "Feature Control Reject" }, + { 0x012c, "MCTR Configuration Request" }, + { 0x012e, "MCTR Configuration Request Accept" }, + { 0x012f, "MCTR Configuration Request Reject" }, + { 0x0130, "MCTR Configuration Result ACK" }, + { 0x0131, "MCTR Configuration Result NACK" }, + { 0x0132, "MCTR Configuration Result" }, { 0, NULL } }; @@ -653,6 +686,13 @@ { 0x9b, "Master TX Chain Delay" }, { 0x9c, "External Condition Class 2 Extension" }, { 0x9d, "TSs MO State" }, + { 0x9e, "Configuration Type" }, + { 0x9f, "Jitter Size" }, + { 0xa0, "Packing Algorithm" }, + { 0xa8, "TRXC List" }, + { 0xa9, "Maximum Allowed Power" }, + { 0xaa, "Maximum Allowed Number of TRXCs" }, + { 0xab, "MCTR Feature Status Bitmap" }, { 0, NULL } }; @@ -663,6 +703,7 @@ { 0x05, "IS" }, { 0x06, "CON" }, { 0x07, "DP" }, + { 0x08, "MCTR" }, { 0x0a, "CF" }, { 0x0b, "TX" }, { 0x0c, "RX" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 Gerrit-Change-Number: 17054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:27:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jan 2020 08:27:29 +0000 Subject: Change in osmo-bsc[master]: OM2000: Add some more message types and IEs we now understand In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17054 ) Change subject: OM2000: Add some more message types and IEs we now understand ...................................................................... Patch Set 1: Code-Review+2 @tnt: I would say it doesn't really make sense to back-port this, or add actual code support for the MCTR object in openbsc anymore. I think once we get the OM2k setup working reliable and have MM/CC/SMS signaling working here, we'd have a solid base for adding MGW E1 TS support. But that's of course your choice. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 Gerrit-Change-Number: 17054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 29 Jan 2020 08:27:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:28:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jan 2020 08:28:15 +0000 Subject: Change in pysim[master]: Fix compatibility with Python 3: print() is a function In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/pysim/+/16982 ) Change subject: Fix compatibility with Python 3: print() is a function ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993 Gerrit-Change-Number: 16982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:38:38 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 29 Jan 2020 08:38:38 +0000 Subject: Change in osmo-bsc[master]: OM2000: Add some more message types and IEs we now understand In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17054 ) Change subject: OM2000: Add some more message types and IEs we now understand ...................................................................... Patch Set 1: Code-Review+1 lgtm -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 Gerrit-Change-Number: 17054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 29 Jan 2020 08:38:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 08:43:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jan 2020 08:43:34 +0000 Subject: Change in osmo-bsc[master]: OM2000: Add some more message types and IEs we now understand In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/17054 ) Change subject: OM2000: Add some more message types and IEs we now understand ...................................................................... OM2000: Add some more message types and IEs we now understand OM2000 is not only used for the venerable RBS2000 family, but also for the more modern RBS6000 family, specifically the DUG 20 GSM baseband unit. In RBS6000, there are some protocol extensions which are not yet fully understood. However, we are understanding some bits around the MCTR (multi carrier transceiver?), a new MO that appears to be present for every physical RUS (Radio Unit) attached to the DUG 20. Let's add what we have learned so far. Thanks to Sylvain Munaut for his help with this. Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 --- M include/osmocom/bsc/abis_om2000.h M src/osmo-bsc/abis_om2000.c 2 files changed, 42 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h index b093a03..49e8510 100644 --- a/include/osmocom/bsc/abis_om2000.h +++ b/include/osmocom/bsc/abis_om2000.h @@ -29,6 +29,7 @@ OM2K_MO_CLS_IS = 0x05, OM2K_MO_CLS_CON = 0x06, OM2K_MO_CLS_DP = 0x07, + OM2K_MO_CLS_MCTR = 0x08, OM2K_MO_CLS_CF = 0x0a, OM2K_MO_CLS_TX = 0x0b, OM2K_MO_CLS_RX = 0x0c, diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 14c373b..f8efa39 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -202,6 +202,26 @@ OM2K_MSGT_NEGOT_REQ_ACK = 0x0104, OM2K_MSGT_NEGOT_REQ_NACK = 0x0105, OM2K_MSGT_NEGOT_REQ = 0x0106, + + OM2K_MSGT_BTS_INITIATED_REQ_ACK = 0x0108, + OM2K_MSGT_BTS_INITIATED_REQ_NACK = 0x0109, + OM2K_MSGT_BTS_INITIATED_REQ = 0x010a, + + OM2K_MSGT_RADIO_CHAN_REL_CMD = 0x010c, + OM2K_MSGT_RADIO_CHAN_REL_COMPL = 0x010e, + OM2K_MSGT_RADIO_CHAN_REL_REJ = 0x010f, + + OM2K_MSGT_FEATURE_CTRL_CMD = 0x0118, + OM2K_MSGT_FEATURE_CTRL_COMPL = 0x011a, + OM2K_MSGT_FEATURE_CTRL_REJ = 0x011b, + + OM2K_MSGT_MCTR_CONFIG_REQ = 0x012c, + OM2K_MSGT_MCTR_CONFIG_REQ_ACK = 0x012e, + OM2K_MSGT_MCTR_CONFIG_REQ_REJ = 0x012f, + + OM2K_MSGT_MCTR_CONFIG_RES_ACK = 0x0130, + OM2K_MSGT_MCTR_CONFIG_RES_NACK = 0x0131, + OM2K_MSGT_MCTR_CONFIG_RES = 0x0132, }; enum abis_om2k_dei { @@ -272,6 +292,13 @@ OM2K_DEI_FS_OFFSET = 0x98, OM2K_DEI_EXT_COND_MAP_2_EXT = 0x9c, OM2K_DEI_TSS_MO_STATE = 0x9d, + OM2K_DEI_CONFIG_TYPE = 0x9e, + OM2K_DEI_JITTER_SIZE = 0x9f, + OM2K_DEI_PACKING_ALGO = 0xa0, + OM2K_DEI_TRXC_LIST = 0xa8, + OM2K_DEI_MAX_ALLOWED_POWER = 0xa9, + OM2K_DEI_MAX_ALLOWED_NUM_TRXCS = 0xaa, + OM2K_DEI_MCTR_FEAT_STATUS_BMAP = 0xab, }; const struct tlv_definition om2k_att_tlvdef = { @@ -521,6 +548,12 @@ { 0x0118, "Feature Control Command" }, { 0x011a, "Feature Control Complete" }, { 0x011b, "Feature Control Reject" }, + { 0x012c, "MCTR Configuration Request" }, + { 0x012e, "MCTR Configuration Request Accept" }, + { 0x012f, "MCTR Configuration Request Reject" }, + { 0x0130, "MCTR Configuration Result ACK" }, + { 0x0131, "MCTR Configuration Result NACK" }, + { 0x0132, "MCTR Configuration Result" }, { 0, NULL } }; @@ -653,6 +686,13 @@ { 0x9b, "Master TX Chain Delay" }, { 0x9c, "External Condition Class 2 Extension" }, { 0x9d, "TSs MO State" }, + { 0x9e, "Configuration Type" }, + { 0x9f, "Jitter Size" }, + { 0xa0, "Packing Algorithm" }, + { 0xa8, "TRXC List" }, + { 0xa9, "Maximum Allowed Power" }, + { 0xaa, "Maximum Allowed Number of TRXCs" }, + { 0xab, "MCTR Feature Status Bitmap" }, { 0, NULL } }; @@ -663,6 +703,7 @@ { 0x05, "IS" }, { 0x06, "CON" }, { 0x07, "DP" }, + { 0x08, "MCTR" }, { 0x0a, "CF" }, { 0x0b, "TX" }, { 0x0c, "RX" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/17054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib868358eca12b94c4fcca58e94ec8ab1a4edfda2 Gerrit-Change-Number: 17054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 10:07:30 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 10:07:30 +0000 Subject: Change in osmo-ccid-firmware[master]: usb dfu header cleanup In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 to look at the new patch set (#2). Change subject: usb dfu header cleanup ...................................................................... usb dfu header cleanup let's stick to one set of headers for the runtime dfu descriptor Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d --- M sysmoOCTSIM/usb/class/dfu/device/dfudf.c M sysmoOCTSIM/usb/class/dfu/device/dfudf.h D sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h D sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_dfu.h M sysmoOCTSIM/usb_start.h 6 files changed, 45 insertions(+), 319 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/37/17037/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d Gerrit-Change-Number: 17037 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 10:33:52 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 10:33:52 +0000 Subject: Change in osmo-asf4-dfu[master]: usb serial number descriptor In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 to look at the new patch set (#3). Change subject: usb serial number descriptor ...................................................................... usb serial number descriptor Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da --- M config/usbd_config.h M usb_dfu_main.c M usb_start.c 3 files changed, 126 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/24/17024/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da Gerrit-Change-Number: 17024 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 10:43:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 10:43:35 +0000 Subject: Change in osmo-asf4-dfu[master]: usb serial number descriptor In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 ) Change subject: usb serial number descriptor ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024/2/usb_start.c File usb_start.c: https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024/2/usb_start.c at 121 PS2, Line 121: SYSMOOCTSIM > why have this specifically to SYSMOOCTSIM? I think this is a generic feature that should work for a [?] I wanted to have something that works with the current octsim, the string index depends on the actual descriptor layout. It could be argued that quite a bit of code is shared between the bootloader and the firmware so it should be put into some sort of common shared code/lib, but there are currently more important issues. -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/17024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I4a23682cee0849c788e5f6c611df4ed1f1cac3da Gerrit-Change-Number: 17024 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 29 Jan 2020 10:43:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 11:12:16 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 11:12:16 +0000 Subject: Change in osmo-ccid-firmware[master]: git version appended to the product usb string descriptor In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 to look at the new patch set (#3). Change subject: git version appended to the product usb string descriptor ...................................................................... git version appended to the product usb string descriptor Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 --- M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_start.c 2 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/35/17035/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 Gerrit-Change-Number: 17035 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 11:12:16 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 11:12:16 +0000 Subject: Change in osmo-ccid-firmware[master]: usb dfu header cleanup In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 to look at the new patch set (#3). Change subject: usb dfu header cleanup ...................................................................... usb dfu header cleanup Let's stick to one set of headers, the hand-crafted usb descriptor structs are prettier than the asf define galore. Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d --- M sysmoOCTSIM/usb/class/dfu/device/dfudf.c M sysmoOCTSIM/usb/class/dfu/device/dfudf.h D sysmoOCTSIM/usb/class/dfu/device/dfudf_desc.h D sysmoOCTSIM/usb/class/dfu/usb_protocol_dfu.h M sysmoOCTSIM/usb_dfu.h M sysmoOCTSIM/usb_start.h 6 files changed, 44 insertions(+), 317 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/37/17037/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d Gerrit-Change-Number: 17037 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 11:12:18 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 11:12:18 +0000 Subject: Change in osmo-ccid-firmware[master]: Implement serial number string descriptor in CTRL EP callback References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055 ) Change subject: Implement serial number string descriptor in CTRL EP callback ...................................................................... Implement serial number string descriptor in CTRL EP callback Change-Id: I910eca1db4baa375bf604110301a0bde25ffcb26 --- M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_descriptors.h M sysmoOCTSIM/usb_start.c 3 files changed, 77 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/55/17055/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 07c5af8..3db67d9 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -436,11 +436,15 @@ //####################### #define NUM_OUT_BUF 16 +char sernr_buf[16*2+1]; +//unicode for descriptor +uint8_t sernr_buf_descr[1+1+16*2*2]; + + +char rstcause_buf[RSTCAUSE_STR_SIZE]; int main(void) { - char sernr_buf[16*2+1]; - char rstcause_buf[RSTCAUSE_STR_SIZE]; #if 0 CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk ; //| /* tracing*/ @@ -469,6 +473,11 @@ get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); get_rstcause_str(rstcause_buf); + sernr_buf_descr[0] = sizeof(sernr_buf_descr); + sernr_buf_descr[1] = 0x3; + for(int i= 2; i < sizeof(sernr_buf_descr); i+=2) + sernr_buf_descr[i] = sernr_buf[i >> 1]; + usb_start(); board_init(); diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index adf6405..df072c2 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -19,6 +19,8 @@ #ifndef USB_DESCRIPTORS_H_ #define USB_DESCRIPTORS_H_ +#include "ccid_device.h" + #define CCID_NUM_CLK_SUPPORTED 4 /* aggregate descriptors for the combined CDC-ACM + CCID device that we expose diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index c6d9fe9..08201cb 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -7,6 +7,7 @@ */ #include "atmel_start.h" #include "usb_start.h" +#include "usb_descriptors.h" #define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ @@ -58,6 +59,67 @@ extern const struct usbd_descriptors usb_descs[]; +/* transmit given string descriptor */ +static bool send_str_desc(uint8_t ep, const struct usb_req *req, enum usb_ctrl_stage stage, + const uint8_t *desc) +{ + uint16_t len_req = LE16(req->wLength); + uint16_t len_desc = desc[0]; + uint16_t len_tx; + bool need_zlp = !(len_req & (CONF_USB_CDCD_ACM_BMAXPKSZ0 - 1)); + + if (len_req <= len_desc) { + need_zlp = false; + len_tx = len_req; + } else { + len_tx = len_desc; + } + + if (ERR_NONE != usbdc_xfer(ep, (uint8_t *)desc, len_tx, need_zlp)) { + return true; + } + + return false; +} + +extern uint8_t sernr_buf_descr[]; +/* call-back for every control EP request */ +static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + uint8_t index, type; + + if (stage != USB_SETUP_STAGE) + return ERR_NOT_FOUND; + + if ((req->bmRequestType & (USB_REQT_TYPE_MASK | USB_REQT_DIR_IN)) != + (USB_REQT_TYPE_STANDARD | USB_REQT_DIR_IN)) + return ERR_NOT_FOUND; + + /* abort if it's not a GET DESCRIPTOR request */ + if (req->bRequest != USB_REQ_GET_DESC) + return ERR_NOT_FOUND; + + /* abort if it's not about a string descriptor */ + type = req->wValue >> 8; + if (type != USB_DT_STRING) + return ERR_NOT_FOUND; +#if 0 + printf("ep=%02x, bmReqT=%04x, bReq=%02x, wValue=%04x, stage=%d\r\n", + ep, req->bmRequestType, req->bRequest, req->wValue, stage); +#endif + /* abort if it's not a standard GET request */ + index = req->wValue & 0x00FF; + switch (index) { + case STR_DESC_SERIAL: + return send_str_desc(ep, req, stage, sernr_buf_descr); + default: + return ERR_NOT_FOUND; + } +} + + +static struct usbdc_handler string_req_h = {NULL, (FUNC_PTR)string_req_cb}; + /** * \brief CDC ACM Init */ @@ -65,10 +127,12 @@ { /* usb stack init */ usbdc_init(ctrl_buffer); + usbdc_register_handler(USBDC_HDL_REQ, &string_req_h); /* usbdc_register_funcion inside */ cdcdf_acm_init(); + printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod); usbdc_start((struct usbd_descriptors *) usb_descs); usbdc_attach(); } @@ -87,7 +151,6 @@ void usb_init(void) { - cdc_device_acm_init(); ccid_df_init(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I910eca1db4baa375bf604110301a0bde25ffcb26 Gerrit-Change-Number: 17055 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 11:44:16 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 11:44:16 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 26: (meh, the new gerrit UI keeps making me miss comments. I don't get it, some comments are plain visible, others are greyed out in a single line and look like jenkins cruft.) > 1- I didn't say it was easy, yet is something really desirable. > 3- It's not only about reviewing for merge. It's a problem about discussing each change. > It's a problem when reading the git log. > It's a problem when bisecting. > It's a problem when understanding why and how stuff was changed, and the implications it had. > It's a problem when reverting. I still agree completely. We don't need to debate the above points at all. Instead we need to discuss the practical tradeoff, which is quite debatable. At least for sponsored work, a large part of the question is: How much budget do you want to spend on it and what is the actual practical positive impact you expect from it? So let's say we do spend another week on separating this patch into three different ones. Then each of this infrastructure implemented on its own will need other (probably weird/ad hoc) inventions to make the intermediate code work. Instead of one large change that makes sense, you get three changes that each take a large step into weird no-mans-land of ad hoc solutions. I doubt that this would help during bisecting, likely some bugs appear in-between the patches to be fixed again right away, and reviewers / log readers need to understand ad-hoc shims just to see them being removed again right in the next patch. That's what I saw coming out of separating, so I stopped that. I really mean that you should try to separate it if you have the time, then it will become obvious how it is not trivial. This seems to me a discussion whether we want large changes at all. It is not possible to trivially change osmo-hlr to achieve a big change like this. BTW, we have used this code at 36c3 in december. OsmoHLR hasn't made any problems. > 2- I agree with keeping ipa-name as a null-terminated string. I started out thinking that we would use this struct for all kinds of identification, i.e. also as Global Title buffer, i.e. that we need to regard it as opaque blob of data. The code now seems to go a different direction, so I guess I don't know which way to take this. I don't want to pass it as an allocated string to avoid ownership. But keeping a separate length seems unnecessary... We did do a bunch of work previously to handle it as opaque blob, explicitly allowing both with nul and without nul; now I could use some help deciding what it should actually be... -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 11:44:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:25:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:25:50 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 26: (15 comments) In general, I wish that the emotional load of applying these changes would not rest only on my shoulders. Reviewers keep indicating how much time they spent on reading and how bad it is to read this code, but please acknowledge that we are writing these patches to accomodate the needs of rural communities, and that we are implementing these things as Osmocom, not as neels vs. the rest. I am trying to find the best path with the best intentions. The review that took an hour to write took me one and a half hours to read and respond/apply. I don't know how many hours I am spending on reading review comments, how many times a week, it is ridiculous to point it out, since the numbers hardly compare to the time I am spending on this side, not even on separating the patches, but on explaining how that is hard. Otherwise, thanks to fixeria for the errors found, I really welcome that! https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 82 PS26, Line 82: osmo_gsup_message_to_str_c > Do we really need such detailed logging? Not sure if this supposed to happen too often. [?] "unable to encode" is probably not ever even once going to happen in practice https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 89 PS26, Line 89: osmo_gsup_message_to_str_c > Same here. Chances are that this message would confuse the end user... [?] "unable to send" is not something I expect to actually happen. This is coding wise the easiest to provide context to the log message. The alternative is '"%s %s", response->imsi, osmo_gsup_message_type_name(...)' (annoying to type and error prone, so I am trying to get away from that) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 104 PS26, Line 104: GSUP message > I think you can print the message type since osmo_gsup_req_new() decodes it for you. the point of this message is the peer routing, i.e. one layer removed from individual subscribers, hence not including the message type https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 108 PS26, Line 108: osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); ^ this one frees the gsup_req, since it passes final=true https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 109 PS26, Line 109: return NULL; > Ok, now (after spending an hour reading the code) I know that osmo_gsup_req_respond_msgt() can also [?] indeed https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_client.c at 294 PS26, Line 294: ipa_client_conn_create2 > Should be easy to submit this as a separate change. [?] ack https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c File src/gsupclient/gsup_req.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 110 PS26, Line 110: msgb_free(req->msg); > BTW: you could just do talloc_steal(req, msg) in osmo_gsup_req_new(). [?] oh, you mean change the talloc hierarchy so that the msgb is a child of the gsup req? That's a nice idea. But msgb are a bit different, AFAIU they're all part of a separate msgb talloc context; Have we done this elsewhere before? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 129 PS26, Line 129: !req->send_response_cb > Do we expect to have an instance of osmo_gsup_req without the response cb? If not, just add an asser [?] I want to not enforce it, it's not a problem at all to keep it conditional. I could invent scenarios, like, you just want to send PurgeMS Requests and don't care about the responses, or you're writing a unit test, but in the end it's just benefiting flexible implementations if it's trivial. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 142 PS26, Line 142: osmo_gsup_req_free > I would better avoid doing the cleanup here and leave it up to the caller. [?] Actually I want to avoid bugs by including the free everywhere implicitly. It sort of crept in later that some code paths don't want to free... I also had two separate function signatures at first: the normal osmo_gsup_req_respond() and a separate osmo_gsup_req_respond_nonfree(). Maybe we should get back to that to make it more obvious? https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c File src/gsupclient/ipa_name.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/23/src/gsupclient/ipa_name.c at 90 PS23, Line 90: return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); > 1- I might not understand it correctly, but isn't it find also allocating a "" string? It's a 1 byte [?] re 1: sure, we can return an allocated "" too... re 2: I really like to get away from stack buffers, especially since we keep creating new stack buffers for every function. It silently increases the mem footprint of the program by mostly unused relatively arbitrary string buffers. The alternative would be to create a single stack buffer for all, but then we run into problems printing more than one info in a LOGP(). I had in the beginning proposed a solution that assigned bits of a single large stack buffer to each function call, but it was overruled by the select ctx ... I don't like having to pass OTC_SELECT as arg, but that's about everything I don't like about it; in general I think it is a pretty elegant solution. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr.c at 447 PS26, Line 447: req->gsup.source_name[0] > The source_name is a pointer (not a buffer) and it can be NULL. Remove [0]. oh right... so quirky how gsup_message has some pointers and some buffers https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c File src/hlr_ussd.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 255 PS26, Line 255: return rc; > memleak, add talloc_free(msg) thx https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 284 PS26, Line 284: struct osmo_gsup_message resp = { : .message_type = gsup_msg_type, : .session_id = ss->session_id, : }; > I am sorry, but what's the point of this change? Just to make everything in the code use your favori [?] indeed https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/hlr_ussd.c at 474 PS26, Line 474: sending might modify some (routing related?) parts > That's odd, I would even say unacceptable. [?] the most important job of osmo_gsup_req is to ensure that all GSUP routing related bits are set correctly. We could copy the gsup_message struct every time in the gsup req api, but callers usually create a struct on the stack to set some few bits and can pass this into gsup_req to complete the message. https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/tests/testsuite.at File tests/testsuite.at: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/tests/testsuite.at at 22 PS26, Line 22: experr > This file is empty, you could just use 'ignore'. not if i want to verify that stderr is empty :P -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 12:25:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:38:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 12:38:36 +0000 Subject: Change in osmo-ccid-firmware[master]: dfu: proper product name for dfu runtime descriptor References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17056 ) Change subject: dfu: proper product name for dfu runtime descriptor ...................................................................... dfu: proper product name for dfu runtime descriptor dfu-util -l says Found Runtime: [1d50:60e3] ver=0002, devnum=72, cfg=1, intf=1, path="1-2", alt=0, name="UNKNOWN", serial="12345" Found Runtime: [1d50:6141] ver=0000, devnum=71, cfg=1, intf=3, path="1-3", alt=0, name="DFU (Runtime)", serial="6789" One is a simtrace2, one is the octsim - let's make flashing less exciting by at least telling the user which one is the octsim... Change-Id: Ifa37c63c97824ce42b3476f53626323cb40b879e --- M sysmoOCTSIM/usb_descriptors.c M sysmoOCTSIM/usb_descriptors.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/56/17056/1 diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index 00d2007..7652bf6 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -221,7 +221,7 @@ 22, 3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0, 10, 3, 'C',0, 'C',0, 'I',0, 'D',0, 12, 3, 'F',0, 'I',0, 'X',0, 'M',0, 'E',0, - 28, 3, 'D',0, 'F',0, 'U',0, ' ',0, '(',0, 'R',0, 'u',0, 'n',0, 't',0, 'i',0, 'm',0, 'e',0 ,')',0, + 52, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'O',0, 'C',0, 'T',0, 'S',0, 'I',0, 'M',0, ' ',0, 'D',0, 'F',0, 'U',0, ' ',0, '(',0, 'R',0, 'u',0, 'n',0, 't',0, 'i',0, 'm',0, 'e',0 ,')',0, #endif } }; diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index ea47d07..ba879f7 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -66,7 +66,7 @@ struct usb_ep_desc ep[3]; } ccid; DFURT_IF_DESCRIPTOR_STRUCT - uint8_t str[176]; + uint8_t str[200]; } __attribute__((packed)); #endif /* USB_DESCRIPTORS_H_ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ifa37c63c97824ce42b3476f53626323cb40b879e Gerrit-Change-Number: 17056 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:43:11 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 12:43:11 +0000 Subject: Change in osmo-ccid-firmware[master]: add the talloc ctx to struct ccid_instance In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16318 ) Change subject: add the talloc ctx to struct ccid_instance ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3b73e68d0347d74f68018614613fcc802f3fdfe7 Gerrit-Change-Number: 16318 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:48:32 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 to look at the new patch set (#27). Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 37 files changed, 1,615 insertions(+), 891 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/27 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 27 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:48:32 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 to look at the new patch set (#7). Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... 2/2: fixup: add osmo_gsup_peer_id with type enum and union During code review it was requested to insert an ability to handle different kinds of peer id, in order to be able to add a Global Title in the future. Add this, but only in the publicly visible API. For osmo-hlr internal code, I intend to push implementing this into the future, when a different peer identification actually gets introduced. This way we don't need to implement it now in all osmo-hlr code paths (save time now), but still make all API users aware that this type may be extended in the future. Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 --- M include/Makefile.am A include/osmocom/gsupclient/gsup_peer_id.h M include/osmocom/gsupclient/gsup_req.h D include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_server.h M src/Makefile.am M src/db_hlr.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/gsup_peer_id.c M src/gsupclient/gsup_req.c D src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/lu_fsm.c M tests/db/Makefile.am M tests/db/db_test.c M tests/gsup_server/Makefile.am 19 files changed, 346 insertions(+), 181 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/16459/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:48:32 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 to look at the new patch set (#29). Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 536 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/29 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 29 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:48:32 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#21). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 21 files changed, 2,005 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:48:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:48:36 +0000 Subject: Change in osmo-hlr[master]: gsup_client.c: fix deprecation for client create func References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17057 ) Change subject: gsup_client.c: fix deprecation for client create func ...................................................................... gsup_client.c: fix deprecation for client create func Change-Id: Iab9f416519b5df3bd4683592b2976f16675d9be7 --- M src/gsupclient/gsup_client.c 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/17057/1 diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 814d5a2..52985c9 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -291,14 +291,15 @@ if (rc != 0) goto failed; - gsupc->link = ipa_client_conn_create(gsupc, - /* no e1inp */ NULL, - 0, - ip_addr, tcp_port, - gsup_client_updown_cb, - gsup_client_read_cb, - /* default write_cb */ NULL, - gsupc); + gsupc->link = ipa_client_conn_create2(gsupc, + /* no e1inp */ NULL, + 0, + /* no specific local IP:port */ NULL, 0, + ip_addr, tcp_port, + gsup_client_updown_cb, + gsup_client_read_cb, + /* default write_cb */ NULL, + gsupc); if (!gsupc->link) goto failed; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iab9f416519b5df3bd4683592b2976f16675d9be7 Gerrit-Change-Number: 17057 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:53:43 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:53:43 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 to look at the new patch set (#28). Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 37 files changed, 1,589 insertions(+), 865 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:54:07 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 28: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsup_server.c at 444 PS26, Line 444: osmo_gsup_create_insert_subscriber_data_msg > I don't see any functional changes to this function, you're basically converting tabs to spaces... thx -- what the heck happened here !? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 12:54:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 12:59:20 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 12:59:20 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 28: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/28/include/osmocom/gsupclient/ipa_name.h File include/osmocom/gsupclient/ipa_name.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/28/include/osmocom/gsupclient/ipa_name.h at 31 PS28, Line 31: uint8_t val[128]; this stuff here is still unresolved. It was conceived with the idea in mind that it would contain arbitrary data. Seems to not make sense after all. need to decide how to do this then to cosmetically ripple through all those patches again to apply what was decided (but I'm not doing that right now) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 12:59:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 13:41:46 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 13:41:46 +0000 Subject: Change in libosmocore[master]: pcsc: don't leak memory References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory ...................................................................... pcsc: don't leak memory Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa --- M src/sim/reader_pcsc.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/17058/1 diff --git a/src/sim/reader_pcsc.c b/src/sim/reader_pcsc.c index 9e05e3c..04a8622 100644 --- a/src/sim/reader_pcsc.c +++ b/src/sim/reader_pcsc.c @@ -87,11 +87,14 @@ num_readers++; } - if (num != num_readers) + if (num != num_readers) { + SCardFreeMemory(st->hContext, mszReaders); goto end; + } st->name = talloc_strdup(rh, ptr); st->dwActiveProtocol = -1; + SCardFreeMemory(st->hContext, mszReaders); return rh; end: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 13:45:43 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jan 2020 13:45:43 +0000 Subject: Change in simtrace2[master]: remsim: allow selecting pcsc reader number References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number ...................................................................... remsim: allow selecting pcsc reader number The number can be queried using pcsc_scan -n Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e --- M host/src/simtrace2-remsim.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/59/17059/1 diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index 03d11df..d27ba07 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -182,6 +182,7 @@ "\t-i\t--gsmtap-ip\tA.B.C.D\n" "\t-a\t--skip-atr\n" "\t-k\t--keep-running\n" + "\t-n\t--pcsc-reader-num\n" "\t-V\t--usb-vendor\tVENDOR_ID\n" "\t-P\t--usb-product\tPRODUCT_ID\n" "\t-C\t--usb-config\tCONFIG_ID\n" @@ -200,6 +201,7 @@ { "skip-atr", 0, 0, 'a' }, { "help", 0, 0, 'h' }, { "keep-running", 0, 0, 'k' }, + { "pcsc-reader-num", 1, 0, 'n' }, { "usb-vendor", 1, 0, 'V' }, { "usb-product", 1, 0, 'P' }, { "usb-config", 1, 0, 'C' }, @@ -285,6 +287,7 @@ int remote_udp_port = 52342; int if_num = 0, vendor_id = -1, product_id = -1; int config_id = -1, altsetting = 0, addr = -1; + int reader_num = 0; char *remote_udp_host = NULL; char *path = NULL; struct osim_reader_hdl *reader; @@ -295,7 +298,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:ak", opts, &option_index); + c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:akn:", opts, &option_index); if (c == -1) break; switch (c) { @@ -318,6 +321,9 @@ case 'k': keep_running = 1; break; + case 'n': + reader_num = atoi(optarg); + break; case 'V': vendor_id = strtol(optarg, NULL, 16); break; @@ -373,7 +379,7 @@ goto close_exit; } - reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL); + reader = osim_reader_open(OSIM_READER_DRV_PCSC, reader_num, "", NULL); if (!reader) { perror("unable to open PC/SC reader"); goto close_exit; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:17:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 14:17:29 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16459/8/include/osmocom/gsupclient/gsup_peer_id.h File include/osmocom/gsupclient/gsup_peer_id.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16459/8/include/osmocom/gsupclient/gsup_peer_id.h at 52 PS8, Line 52: struct osmo_gsup_peer_id { I guess this is the wrong name. If we need other identification of a peer, it is likely not on GSUP. osmo_hlr_peer_id? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jan 2020 14:17:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:25:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:25:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: set titan.TestPorts.UDPasp_commit References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17060 ) Change subject: deps: set titan.TestPorts.UDPasp_commit ...................................................................... deps: set titan.TestPorts.UDPasp_commit Fixes: 7c5cb6eb8aa7 ("deps: use UDPasp from osmocom github fork") Change-Id: I141b906d2a5969afb5f6e27413fa1c18c54d5708 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/17060/1 diff --git a/deps/Makefile b/deps/Makefile index b04db9d..d896889 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -122,7 +122,7 @@ titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 titan.TestPorts.TELNETasp_commit= R.9.A-3-g62f281b -titan.TestPorts.UDPasp_commit= R.8.B-3-gbf5e87b +titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336 titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-8-g7ec4fe0 titan.TestPorts.USB_commit= master -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17060 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: I141b906d2a5969afb5f6e27413fa1c18c54d5708 Gerrit-Change-Number: 17060 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:25:16 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:25:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add emulated GSUP server (second HLR) References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061 ) Change subject: hlr: add emulated GSUP server (second HLR) ...................................................................... hlr: add emulated GSUP server (second HLR) Prepare for upcoming D-GSM test, which needs to emulate a GSUP server. Related: OS#4380 Change-Id: Idbfe8a145c90a524145089a06d9bbefac4d7edd8 --- M hlr/HLR_Tests.ttcn M library/GSUP_Emulation.ttcn 2 files changed, 73 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/17061/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index d4681dc..2becad8 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -36,6 +36,7 @@ import from MSLookup_mDNS_Templates all; type component test_CT extends CTRL_Adapter_CT { + /* emulated GSUP client (MSC/SGSN) */ var IPA_Emulation_CT vc_IPA; var IPA_CCM_Parameters ccm_pars; /* legacy tests without ConnHdlr */ @@ -49,10 +50,15 @@ var MSLookup_mDNS_Emulation_CT vc_MSLookup_mDNS; + /* emulated GSUP server (second HLR) */ + var IPA_Emulation_CT vc_IPA_server; + var GSUP_Emulation_CT vc_GSUP_server; + timer g_Tguard := 10.0; }; modulepar { + /* OsmoHLR */ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_gsup_port := 4222; integer mp_hlr_ctrl_port := 4259; @@ -60,6 +66,10 @@ when IE ts_GSUP_IE_NUM_VECTORS_REQ is absent */ integer mp_default_num_auth_tuples := 5; + /* emulated GSUP server (second HLR) */ + charstring mp_hlr_ts_ip := "127.0.0.99"; + integer mp_hlr_ts_port := 4222; + /* drop after osmo-hlr release > 1.2.0 */ boolean mp_hlr_supports_dgsm := true; }; @@ -90,6 +100,11 @@ var HLR_ConnHdlrPars g_pars; port TELNETasp_PT VTY; port MSLookup_mDNS_PT mDNS; + + /* Pass from test_CT for explicit addressing */ + var GSUP_Emulation_CT vc_GSUP_server; + var GSUP_Emulation_CT vc_GSUP_client; + var IPA_CCM_Parameters ccm_pars_client; } type record HLR_ConnHdlrPars { @@ -138,6 +153,7 @@ } } +/* emulated GSUP client (MSC/SGSN) */ function f_init_gsup(charstring id, boolean legacy) runs on test_CT { id := id & "-GSUP"; var GsupOps ops := { @@ -180,12 +196,29 @@ } } +/* emulated GSUP server (second HLR) */ +function f_init_gsup_server(charstring id) runs on test_CT { + id := id & "-GSUP-server"; + var GsupOps ops := { + create_cb := refers(GSUP_Emulation.ExpectedCreateCallback) + } + + vc_GSUP_server := GSUP_Emulation_CT.create(id); + vc_IPA_server := IPA_Emulation_CT.create(id & "-IPA"); + + connect(vc_GSUP_server:GSUP, vc_IPA_server:IPA_GSUP_PORT); + map(vc_IPA_server:IPA_PORT, system:IPA_CODEC_PT); + + vc_GSUP_server.start(GSUP_Emulation.main(ops, id)); + vc_IPA_server.start(IPA_Emulation.main_server(mp_hlr_ts_ip, mp_hlr_ts_port)); +} + function f_init_mslookup() runs on test_CT { vc_MSLookup_mDNS := MSLookup_mDNS_Emulation_CT.create; vc_MSLookup_mDNS.start(MSLookup_mDNS_Emulation.f_main()); } -function f_init(boolean legacy := true) runs on test_CT { +function f_init(boolean legacy := true, boolean gsup_server := false) runs on test_CT { /* activate default guard timer to ensure all tests eventually terminate */ g_Tguard.start; @@ -195,10 +228,20 @@ f_init_vty(); f_init_mslookup(); + if (gsup_server) { + f_init_gsup_server("HLR_Test"); + } + f_ipa_ctrl_start(mp_hlr_ip, mp_hlr_ctrl_port); } -function f_start_handler(void_fn fn, HLR_ConnHdlrPars pars) runs on test_CT return HLR_ConnHdlr { +/*! Start HLR_ConnHdlr from testCT in a separate thread. + * \param void_fn function to run inside the thread. + * \param gsup_server if true, connect the emulated GSUP server ports to the new HLR_ConnHdlr. Then both the emulated + * GSUP client (MSC/SGSN) and server (second HLR) are connected. Explicit addressing with "to" and + * "from" must be used, i.e. 'GSUP.receive(tr_GSUP_UL_REQ(...)) from vc_GSUP_server'. */ +function f_start_handler(void_fn fn, HLR_ConnHdlrPars pars, boolean gsup_server := false) runs on test_CT +return HLR_ConnHdlr { var HLR_ConnHdlr vc_conn; var charstring id := testcasename(); @@ -207,7 +250,14 @@ connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); connect(vc_conn:mDNS, vc_MSLookup_mDNS:mDNS); - vc_conn.start(f_handler_init(fn, id, pars)); + if (gsup_server) { + connect(vc_conn:GSUP, vc_GSUP_server:GSUP_CLIENT); + connect(vc_conn:GSUP_PROC, vc_GSUP_server:GSUP_PROC); + vc_conn.start(f_handler_init(fn, id, vc_GSUP_server, vc_GSUP, ccm_pars, pars)); + } else { + vc_conn.start(f_handler_init(fn, id, omit, vc_GSUP, ccm_pars, pars)); + } + return vc_conn; } @@ -218,12 +268,23 @@ } /* first function inside ConnHdlr component; sets g_pars + starts function */ -function f_handler_init(void_fn fn, charstring id, template (omit) HLR_ConnHdlrPars pars := omit) +function f_handler_init(void_fn fn, charstring id, + template (omit) GSUP_Emulation_CT vc_GSUP_server_test_ct, + GSUP_Emulation_CT vc_GSUP_client_test_ct, + IPA_CCM_Parameters ccm_pars_client_test_ct, + template (omit) HLR_ConnHdlrPars pars := omit) runs on HLR_ConnHdlr { + /* Pass from test_CT for explicit addressing */ + if (isvalue(vc_GSUP_server_test_ct)) { + vc_GSUP_server := valueof(vc_GSUP_server_test_ct); + } + vc_GSUP_client := vc_GSUP_client_test_ct; + ccm_pars_client := ccm_pars_client_test_ct; + if (isvalue(pars)) { g_pars := valueof(pars); - f_create_gsup_expect(hex2str(g_pars.sub.imsi)); + f_create_gsup_expect_explicit(hex2str(g_pars.sub.imsi), vc_GSUP_client); } f_handler_init_vty(); fn.apply(); diff --git a/library/GSUP_Emulation.ttcn b/library/GSUP_Emulation.ttcn index 5695534..4a03359 100644 --- a/library/GSUP_Emulation.ttcn +++ b/library/GSUP_Emulation.ttcn @@ -295,4 +295,11 @@ } } +/* Same as f_create_gsup_expect, but with explicit addressing. Needed when connecting multiple ports to GSUP_PROC. */ +function f_create_gsup_expect_explicit(charstring imsi, GSUP_Emulation_CT ct) runs on GSUP_ConnHdlr { + GSUP_PROC.call(GSUPEM_register:{imsi, self}) to ct { + [] GSUP_PROC.getreply(GSUPEM_register:{?,?}) {}; + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061 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: Idbfe8a145c90a524145089a06d9bbefac4d7edd8 Gerrit-Change-Number: 17061 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:25:17 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:25:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add dest name to some messages References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17062 ) Change subject: library/GSUP_Types: add dest name to some messages ...................................................................... library/GSUP_Types: add dest name to some messages Prepare for upcoming D-GSM test, that lets OsmoHLR act as proxy. It forwards the messages based on the destination name, so the testsuite must set it correctly. Related: OS#4380 Change-Id: I7623b7a7c7a18ba18a38d0834979d18ab0fbb961 --- M library/GSUP_Types.ttcn 1 file changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/17062/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 0f36d4d..fa912c1 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -502,8 +502,9 @@ template GSUP_PDU tr_GSUP_UL_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, imsi); -template (value) GSUP_PDU ts_GSUP_UL_RES(hexstring imsi) := - ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)) }); +template (value) GSUP_PDU ts_GSUP_UL_RES(hexstring imsi, octetstring destination_name := ''O) := + ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Destination_Name(destination_name))}); template GSUP_PDU tr_GSUP_UL_RES(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, imsi); @@ -516,17 +517,19 @@ tr_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR, { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause) }); -template (value) GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn) := +template (value) GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn, octetstring destination_name := ''O) := ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST, { - valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_MSISDN(msisdn)) }); + valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_MSISDN(msisdn)), + valueof(ts_GSUP_IE_Destination_Name(destination_name))}); template GSUP_PDU tr_GSUP_ISD_REQ(template hexstring imsi, template hexstring msisdn := ?) := tr_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST, { tr_GSUP_IE_IMSI(imsi), *, tr_GSUP_IE_MSISDN(msisdn), * }); -template (value) GSUP_PDU ts_GSUP_ISD_RES(hexstring imsi) := +template (value) GSUP_PDU ts_GSUP_ISD_RES(hexstring imsi, octetstring destination_name := ''O) := ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_RESULT, { - valueof(ts_GSUP_IE_IMSI(imsi)) }); + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Destination_Name(destination_name))}); template GSUP_PDU tr_GSUP_ISD_RES(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_INSERT_DATA_RESULT, imsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17062 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: I7623b7a7c7a18ba18a38d0834979d18ab0fbb961 Gerrit-Change-Number: 17062 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:25:18 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:25:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/DNS_Helpers: add f_enc_IPv4 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063 ) Change subject: library/DNS_Helpers: add f_enc_IPv4 ...................................................................... library/DNS_Helpers: add f_enc_IPv4 Used by upcoming D-GSM test, to pass the IP of the emulated GSUP server. The code is based on f_enc_dns_hostname() in the same file. Related: OS#4380 Change-Id: I8a5450988711680c93cfd657a34db759a56bc41e --- M library/DNS_Helpers.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/17063/1 diff --git a/library/DNS_Helpers.ttcn b/library/DNS_Helpers.ttcn index 122adff..85040fc 100644 --- a/library/DNS_Helpers.ttcn +++ b/library/DNS_Helpers.ttcn @@ -70,4 +70,27 @@ } +function f_enc_IPv4(charstring str) return octetstring { + var octetstring ret := ''O; + + while (lengthof(str) > 0) { + var integer dot_idx; + var charstring num; + + dot_idx := f_strchr(str, "."); + if (dot_idx >= 0) { + /* there is another dot */ + num := substr(str, 0, dot_idx); + str := substr(str, dot_idx+1, lengthof(str)-dot_idx-1); + } else { + /* no more dot */ + num := str; + str := ""; + } + ret := ret & int2oct(str2int(num), 1); + } + + return ret; +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063 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: I8a5450988711680c93cfd657a34db759a56bc41e Gerrit-Change-Number: 17063 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:25:19 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:25:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 ) Change subject: hlr: new test: TC_MSLookup_GSUP_proxy ...................................................................... hlr: new test: TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and another HLR during Location Update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 137 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 2becad8..04b257d 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -34,6 +34,7 @@ import from MSLookup_mDNS_Types all; import from MSLookup_mDNS_Emulation all; import from MSLookup_mDNS_Templates all; +import from DNS_Helpers all; type component test_CT extends CTRL_Adapter_CT { /* emulated GSUP client (MSC/SGSN) */ @@ -1651,6 +1652,57 @@ vc_conn.done; } +/* Let OsmoHLR act as proxy between MSC and another HLR during UL */ +private function f_TC_MSLookup_GSUP_proxy() runs on HLR_ConnHdlr { + var MSLookup_mDNS mdns_msg; + var integer id; + var hexstring imsi := g_pars.sub.imsi; + var hexstring msisdn := g_pars.sub.msisdn; + var charstring domain := "gsup.hlr." & hex2str(imsi) & ".imsi.mdns.osmocom.org"; + var octetstring destination_name := char2oct(ccm_pars_client.ser_nr) & '00'O; /* TS-MSC IPA name */ + + /* [GSUP] TS-MSC => HLR proxy: Update Location Request with unknown IMSI */ + GSUP.send(valueof(ts_GSUP_UL_REQ(imsi, OSMO_GSUP_CN_DOMAIN_CS))) to vc_GSUP_client; + + /* [GSUP] TS-HLR: expect GSUP messages with that IMSI */ + f_create_gsup_expect_explicit(hex2str(imsi), vc_GSUP_server); + + /* [mDNS] TS-HLR <= HLR proxy: query for GSUP server who knows the IMSI */ + mDNS.receive(tr_MSLookup_mDNS_query(domain)) -> value mdns_msg; + + /* [mDNS] TS-HLR => HLR proxy: result with IP/port of TS GSUP server */ + id := mdns_msg.dnsMessage.header.id; + mDNS.send(t_MSLookup_mDNS_result_IPv4(id, domain, f_enc_IPv4(mp_hlr_ts_ip), mp_hlr_ts_port)); + + /* [GSUP] TS-HLR <=> HLR proxy <=> TS-MSC: finish up UL */ + GSUP.receive(tr_GSUP_UL_REQ(imsi)) from vc_GSUP_server; + GSUP.send(valueof(ts_GSUP_ISD_REQ(imsi, msisdn, destination_name))) to vc_GSUP_server; + GSUP.receive(tr_GSUP_ISD_REQ(imsi, g_pars.sub.msisdn)) from vc_GSUP_client; + GSUP.send(valueof(ts_GSUP_ISD_RES(imsi, destination_name))) to vc_GSUP_server; + GSUP.receive(tr_GSUP_ISD_RES(imsi)) from vc_GSUP_client; + GSUP.send(valueof(ts_GSUP_UL_RES(imsi, destination_name))) to vc_GSUP_server; + GSUP.receive(tr_GSUP_UL_RES(imsi)) from vc_GSUP_client; + + setverdict(pass); +} +testcase TC_MSLookup_GSUP_proxy() runs on test_CT { + var hexstring imsi := f_rnd_imsi('26242'H); + var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9); + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi, msisdn)); + + f_init(false, true); + f_vty_config(VTY, "mslookup", "mdns bind"); + vc_conn := f_start_handler(refers(f_TC_MSLookup_GSUP_proxy), pars, true); + + timer T := 3.0; + T.start; + alt { + [] vc_conn.done {} + [] T.timeout { setverdict(fail, "Timeout"); mtc.stop; }; + } +} + /* TODO: * UL with ISD error * UL with ISD timeout @@ -1699,6 +1751,7 @@ if (mp_hlr_supports_dgsm) { execute( TC_MSLookup_mDNS_server() ); + execute( TC_MSLookup_GSUP_proxy() ); } }; diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 14a3f8d..c77920d 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -48,7 +48,7 @@ FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " -FILES+="MSLookup_mDNS_Types.ttcn MSLookup_mDNS_Emulation.ttcn MSLookup_mDNS_Templates.ttcn" +FILES+="MSLookup_mDNS_Types.ttcn MSLookup_mDNS_Emulation.ttcn MSLookup_mDNS_Templates.ttcn DNS_Helpers.ttcn " gen_links $DIR $FILES diff --git a/library/MSLookup_mDNS_Templates.ttcn b/library/MSLookup_mDNS_Templates.ttcn index e2426fa..e8158eb 100644 --- a/library/MSLookup_mDNS_Templates.ttcn +++ b/library/MSLookup_mDNS_Templates.ttcn @@ -45,6 +45,38 @@ udpPort := 4266 } +template MSLookup_mDNS tr_MSLookup_mDNS_query(charstring domain) := { + dnsMessage := { + header := { + id := ?, + qr := DNS_QUERY, + opCode := 0, + aa := false, + tc := false, + rd := false, + ra := false, + z := '000'B, + rCode := DNS_NO_ERROR, + qdCount := 1, + anCount := 0, + nsCount := 0, + arCount := 0 + }, + queries := { + { + qName := domain, + qType := 255, + qClass := DNS_IN + } + }, + answers := {}, + nameServerRecords := {}, + additionalRecords := {} + }, + udpAddress := ?, + udpPort := ? +} + template MSLookup_mDNS tr_MSLookup_mDNS_result_IPv4(integer id, charstring domain, UInt32 ip_v4, integer port_v4) := { dnsMessage := { header := { @@ -96,4 +128,55 @@ udpPort := ? } +template MSLookup_mDNS t_MSLookup_mDNS_result_IPv4(integer id, charstring domain, UInt32 ip_v4, integer port_v4) := { + dnsMessage := { + header := { + id := id, + qr := DNS_RESPONSE, + opCode := DNS_OP_QUERY, + aa := false, + tc := false, + rd := false, + ra := false, + z := '000'B, + rCode := DNS_NO_ERROR, + qdCount := 0, + anCount := 3, + nsCount := 0, + arCount := 0 + }, + queries := {}, + answers := { + { + name := domain, + rrType := DNS_TXT, + rrClass := DNS_IN, + ttl := '00000000'O, + rdLength := 6, + rData := {txt := {"age=0"}} + }, + { + name := domain, + rrType := DNS_A, + rrClass := DNS_IN, + ttl := '00000000'O, + rdLength := 4, + rData := {a := ip_v4} + }, + { + name := domain, + rrType := DNS_TXT, + rrClass := DNS_IN, + ttl := '00000000'O, + rdLength := 1 + lengthof("port=" & int2str(port_v4)), + rData := {txt := {"port=" & int2str(port_v4)}} + } + }, + nameServerRecords := {}, + additionalRecords := {} + }, + udpAddress := "239.192.23.42", + udpPort := 4266 +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:40:20 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 29 Jan 2020 14:40:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 to look at the new patch set (#2). Change subject: hlr: new test: TC_MSLookup_GSUP_proxy ...................................................................... hlr: new test: TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and another HLR during Location Update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 137 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 14:44:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 29 Jan 2020 14:44:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 ) Change subject: hlr: new test: TC_MSLookup_GSUP_proxy ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn at 1663 PS1, Line 1663: maybe add comment: Testing the HLR as proxy. The MSC asking the proxy and the home HLR are both enacted by TTCN3 (TS). MSC=vc_GSUP_client <---> osmo-hlr as proxy <---> vc_GSUP_server=home HLR GSUP.send(..) to vc_GSUP_client ---> osmo-hlr ---> GSUP.receive(..) from vc_GSUP_server GSUP.receive(..) from vc_GSUP_client <--- osmo-hlr <--- GSUP.send(..) to vc_GSUP_server -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Wed, 29 Jan 2020 14:44:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:21:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:21:22 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce RemoteHost and refactor code to use it References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065 ) Change subject: Introduce RemoteHost and refactor code to use it ...................................................................... Introduce RemoteHost and refactor code to use it Let's move code related to coping stuff to remote hosts and managing remote processes under a class where relevant information is stored. This simplifies parameters being passed all over and allows to reuse more code. Change-Id: Ifff5ded8fdb28e8ef267cebe6c5f30a910cae11a --- M src/osmo_gsm_tester/bts_oc2g.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/process.py A src/osmo_gsm_tester/remote.py 5 files changed, 169 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/65/17065/1 diff --git a/src/osmo_gsm_tester/bts_oc2g.py b/src/osmo_gsm_tester/bts_oc2g.py index ec4ed3d..7b46fc8 100644 --- a/src/osmo_gsm_tester/bts_oc2g.py +++ b/src/osmo_gsm_tester/bts_oc2g.py @@ -41,14 +41,6 @@ def _direct_pcu_enabled(self): return util.str2bool(self.conf.get('direct_pcu')) - def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): - run_dir = self.run_dir.new_dir(name) - proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, - popen_args) - self.suite_run.remember_to_stop(proc, keepalive) - proc.launch() - return proc - def create_pcu(self): return pcu_oc2g.OsmoPcuOC2G(self.suite_run, self, self.conf) @@ -116,15 +108,19 @@ if not self.inst.isfile('bin', OsmoBtsOC2G.BTS_OC2G_BIN): raise log.Error('No osmo-bts-oc2g binary in', self.inst) - remote_run_dir = util.Dir(OsmoBtsOC2G.REMOTE_DIR) - - self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, - self.remote_addr(), OsmoBtsOC2G.BTS_OC2G_BIN, self.config_file) - + rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.remote_addr()) + remote_prefix_dir = util.Dir(OsmoBtsOC2G.REMOTE_DIR) + self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst)))) + remote_run_dir = util.Dir(remote_prefix_dir.child(OsmoBtsOC2G.BTS_OC2G_BIN)) remote_config_file = remote_run_dir.child(OsmoBtsOC2G.BTS_OC2G_CFG) - remote_lib = self.remote_inst.child('lib') - remote_binary = self.remote_inst.child('bin', 'osmo-bts-oc2g') + rem_host.recreate_remote_dir(self.remote_inst) + rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir) + rem_host.create_remote_dir(remote_run_dir) + rem_host.scp('scp-cfg-to-remote', self.config_file, remote_config_file) + + remote_lib = self.remote_inst.child('lib') + remote_binary = self.remote_inst.child('bin', OsmoBtsOC2G.BTS_OC2G_BIN) args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-c', remote_config_file, '-r', '1', '-i', self.bsc.addr()) @@ -132,6 +128,7 @@ if self._direct_pcu_enabled(): args += ('-M',) - self.proc_bts = self.launch_remote('osmo-bts-oc2g', args, remote_cwd=remote_run_dir, keepalive=keepalive) - + proc = rem_host.RemoteProcess(OsmoBtsOC2G.BTS_OC2G_BIN, args) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 9110d8a..78c17cc 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -18,10 +18,9 @@ # along with this program. If not, see . import os -import stat import pprint from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, bts_osmo +from . import log, config, util, template, process, remote, bts_osmo from . import powersupply from .event_loop import MainLoop @@ -263,72 +262,41 @@ proc.launch() return proc - def launch_process_remote(self, name, popen_args, remote_cwd=None, keepalive=False): - run_dir = self.run_dir.new_dir(name) - proc = process.RemoteProcess(name, run_dir, self.remote_user, self.listen_ip, remote_cwd, - popen_args) - self.suite_run.remember_to_stop(proc, keepalive) - proc.launch() - return proc - - def generate_wrapper_script(self): - wrapper_script = self.run_dir.new_file(OsmoTrx.WRAPPER_SCRIPT) - with open(wrapper_script, 'w') as f: - r = """#!/bin/bash - mypid=0 - sign_handler() { - sig=$1 - echo "received signal handler $sig, killing $mypid" - kill $mypid - } - trap 'sign_handler SIGTERM' SIGTERM - trap 'sign_handler SIGINT' SIGINT - trap 'sign_handler SIGHUP' SIGHUP - "$@" & - mypid=$! - echo "waiting for $mypid" - wait $mypid - echo "process $mypid finished" - """ - f.write(r) - st = os.stat(wrapper_script) - os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC) - return wrapper_script - - def inst_compatible_for_remote(self): - proc = process.run_remote_sync(self.run_dir, self.remote_user, self.listen_ip, 'uname-m', ('uname', '-m')) - if "x86_64" in (proc.get_stdout() or ''): - return True - return False - def start_remotely(self, keepalive): # Run remotely through ssh. We need to run osmo-trx under a wrapper # script since osmo-trx ignores SIGHUP and will keep running after # we close local ssh session. The wrapper script catches SIGHUP and # sends SIGINT to it. - remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR) + + rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.listen_ip) + + remote_prefix_dir = util.Dir(OsmoTrx.REMOTE_DIR) + remote_run_dir = util.Dir(remote_prefix_dir.child(self.binary_name())) remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX) - have_inst = self.inst_compatible_for_remote() + have_inst = rem_host.inst_compatible_for_remote() if have_inst: self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) - # if self.inst is None, we still want to copy config file, create remote run dir, etc. - self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, - self.listen_ip, self.binary_name(), self.config_file) - - wrapper_script = self.generate_wrapper_script() - remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT) - process.scp(self.run_dir, self.remote_user, self.listen_ip, 'scp-wrapper-to-remote', wrapper_script, remote_wrapper_script) + rem_host.recreate_remote_dir(remote_prefix_dir) + if have_inst: + self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst)))) + rem_host.create_remote_dir(self.remote_inst) + rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir) + rem_host.create_remote_dir(remote_run_dir) + rem_host.scp('scp-cfg-to-remote', self.config_file, remote_config_file) if have_inst: remote_lib = self.remote_inst.child('lib') remote_binary = self.remote_inst.child('bin', self.binary_name()) - args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_wrapper_script, remote_binary, '-C', remote_config_file) + args = (remote_binary, '-C', remote_config_file) else: # Use whatever is available i nremote system PATH: - args = (remote_wrapper_script, self.binary_name(), '-C', remote_config_file) - - self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive) + remote_lib = None + remote_binary = self.binary_name() + args = (remote_binary, '-C', remote_config_file) + self.proc_trx = rem_host.RemoteProcessFixIgnoreSIGHUP(self.binary_name(), remote_run_dir, args, prepend_ldlibpath=remote_lib) + self.suite_run.remember_to_stop(self.proc_trx, keepalive) + self.proc_trx.launch() ############## # PUBLIC (test API included) diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index 66d305a..90d4790 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -19,7 +19,7 @@ import os import pprint -from . import log, config, util, template, process, pcu_sysmo, bts_osmo +from . import log, config, util, template, process, remote, pcu_sysmo, bts_osmo class SysmoBts(bts_osmo.OsmoBts): ############## @@ -41,14 +41,6 @@ def _direct_pcu_enabled(self): return util.str2bool(self.conf.get('direct_pcu')) - def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): - run_dir = self.run_dir.new_dir(name) - proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd, - popen_args) - self.suite_run.remember_to_stop(proc, keepalive) - proc.launch() - return proc - def create_pcu(self): return pcu_sysmo.OsmoPcuSysmo(self.suite_run, self, self.conf) @@ -110,17 +102,21 @@ if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN): raise log.Error('No osmo-bts-sysmo binary in', self.inst) - remote_run_dir = util.Dir(SysmoBts.REMOTE_DIR) - - self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user, - self.remote_addr(), SysmoBts.BTS_SYSMO_BIN, self.config_file) - process.run_remote_sync(self.run_dir, self.remote_user, self.remote_addr(), 'reload-dsp-firmware', - ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) - + rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.remote_addr()) + remote_prefix_dir = util.Dir(SysmoBts.REMOTE_DIR) + self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst)))) + remote_run_dir = util.Dir(remote_prefix_dir.child(SysmoBts.BTS_SYSMO_BIN)) remote_config_file = remote_run_dir.child(SysmoBts.BTS_SYSMO_CFG) - remote_lib = self.remote_inst.child('lib') - remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo') + rem_host.recreate_remote_dir(self.remote_inst) + rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir) + rem_host.create_remote_dir(remote_run_dir) + rem_host.scp('scp-cfg-to-remote', self.config_file, remote_config_file) + + rem_host.run_remote_sync('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"')) + + remote_lib = self.remote_inst.child('lib') + remote_binary = self.remote_inst.child('bin', SysmoBts.BTS_SYSMO_BIN) args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-c', remote_config_file, '-r', '1', '-i', self.bsc.addr()) @@ -128,6 +124,8 @@ if self._direct_pcu_enabled(): args += ('-M',) - self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir, keepalive=keepalive) + proc = rem_host.RemoteProcess(SysmoBts.BTS_SYSMO_BIN, args) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 06da3bf..1c2f592 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -406,32 +406,4 @@ proc = NetNSProcess(name, run_dir, netns, popen_args) proc.launch_sync() return proc - -def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): - run_dir = run_dir.new_dir(name) - proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) - proc.launch_sync() - return proc - -def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): - run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) - -# If no inst binaries copying is required (eg. because binary+libs is already available in distro), inst can be None. -def copy_inst_ssh(run_dir, inst, remote_dir, remote_user, remote_addr, remote_rundir_append, cfg_file_name): - remote_dir_str = str(remote_dir) - run_remote_sync(run_dir, remote_user, remote_addr, 'rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str)) - run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-dir', ('mkdir', '-p', remote_dir_str)) - if inst is not None: - remote_inst = Dir(remote_dir.child(os.path.basename(str(inst)))) - scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str) - else: - remote_inst = None - - remote_run_dir = remote_dir.child(remote_rundir_append) - run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir)) - - remote_config_file = remote_dir.child(os.path.basename(cfg_file_name)) - scp(run_dir, remote_user, remote_addr, 'scp-cfg-to-remote', cfg_file_name, remote_config_file) - return remote_inst - # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/remote.py b/src/osmo_gsm_tester/remote.py new file mode 100644 index 0000000..92dd113 --- /dev/null +++ b/src/osmo_gsm_tester/remote.py @@ -0,0 +1,117 @@ +# osmo_gsm_tester: specifics for remote nodes +# +# Copyright (C) 2020 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import stat +import os +import re +import pprint + +from . import log, util, config, template, process, osmo_ctrl, pcap_recorder + +class RemoteHost(log.Origin): + + WRAPPER_SCRIPT = 'ssh_sigkiller.sh' + + def __init__(self, run_dir, remote_user = 'root', remote_host = 'localhost', remote_cwd=None): + super().__init__(log.C_RUN, 'host-' + remote_user + '@' + remote_host) + self.run_dir = util.Dir(run_dir.new_dir(self.name())) + self.remote_user = remote_user + self.remote_host = remote_host + self.remote_cwd = remote_cwd + + def user(self): + return self.remote_user + + def host(self): + return self.remote_host + + def cwd(self): + return self.remote_cwd + + def RemoteProcess(self, name, popen_args, **popen_kwargs): + run_dir = self.run_dir.new_dir(name) + return process.RemoteProcess(name, run_dir, self.user(), self.host(), self.cwd(), popen_args, **popen_kwargs) + + def generate_wrapper_script(self): + wrapper_script = self.run_dir.new_file(RemoteHost.WRAPPER_SCRIPT) + with open(wrapper_script, 'w') as f: + r = """#!/bin/bash + mypid=0 + sign_handler() { + sig=$1 + echo "received signal handler $sig, killing $mypid" + kill $mypid + } + trap 'sign_handler SIGTERM' SIGTERM + trap 'sign_handler SIGINT' SIGINT + trap 'sign_handler SIGHUP' SIGHUP + $@ & + mypid=$! + echo "waiting for $mypid" + wait $mypid + echo "process $mypid finished" + """ + f.write(r) + st = os.stat(wrapper_script) + os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC) + return wrapper_script + + def RemoteProcessFixIgnoreSIGHUP(self, name, remote_dir, popen_args, prepend_ldlibpath=None, **popen_kwargs): + # Run remotely through ssh. We need to run binary under a wrapper + # script since osmo-trx ignores SIGHUP and will keep running after + # we close local ssh session. The wrapper script catches SIGHUP and + # sends SIGINT to it. + self.create_remote_dir(remote_dir) + + wrapper_script = self.generate_wrapper_script() + remote_wrapper_script = remote_dir.child(RemoteHost.WRAPPER_SCRIPT) + self.scp('scp-wrapper-to-remote', wrapper_script, remote_wrapper_script) + + # Used fi to run stuff from an osmo-gsm-tester copied inst + if prepend_ldlibpath is not None: + args = ('LD_LIBRARY_PATH=%s' % prepend_ldlibpath, remote_wrapper_script,) + popen_args + else: + args = (remote_wrapper_script,) + popen_args + return self.RemoteProcess(name, args, **popen_kwargs) + + def run_remote_sync(self, name, popen_args): + proc = self.RemoteProcess(name, popen_args) + proc.launch_sync() + return proc + + def rm_remote_dir(self, remote_dir): + remote_dir_str = str(remote_dir) + self.run_remote_sync('rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str)) + + def create_remote_dir(self, remote_dir): + remote_dir_str = str(remote_dir) + self.run_remote_sync('mk-remote-dir', ('mkdir', '-p', remote_dir_str)) + + def recreate_remote_dir(self, remote_dir): + self.rm_remote_dir(remote_dir) + self.create_remote_dir(remote_dir) + + def inst_compatible_for_remote(self): + proc = self.run_remote_sync('uname-m', ('uname', '-m')) + if "x86_64" in (proc.get_stdout() or ''): + return True + return False + + def scp(self, name, local_path, remote_path): + process.run_local_sync(self.run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (self.user(), self.host(), remote_path))) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ifff5ded8fdb28e8ef267cebe6c5f30a910cae11a Gerrit-Change-Number: 17065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:22:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:22:44 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Install srsLTE dependencies References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17066 ) Change subject: ansible: gsm-tester: Install srsLTE dependencies ...................................................................... ansible: gsm-tester: Install srsLTE dependencies Change-Id: Ia6804d0d0c40ad2ebe8a09b0861f14f15578a834 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/66/17066/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index d880127..5cc83bc 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -37,6 +37,20 @@ - liblua5.3-dev - lua-socket +- name: install srsLTE runtime dependencies + apt: + name: "{{ item }}" + with_items: + - cmake + - libfftw3-dev + - libmbedtls-dev + - libboost-program-options-dev + - libconfig++-dev + - libsctp-dev + - libpcsclite-dev + - libuhd-dev + - libczmq-dev + - name: install ofono build dependencies apt: name: ofono -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia6804d0d0c40ad2ebe8a09b0861f14f15578a834 Gerrit-Change-Number: 17066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:24:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:24:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add scripts to build srsLTE software References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 ) Change subject: contrib: Add scripts to build srsLTE software ...................................................................... contrib: Add scripts to build srsLTE software Change-Id: Id9d63920a44a80af187e649c9be5fd7498fa5f44 --- M contrib/jenkins-build-common.sh A contrib/jenkins-build-srslte.sh A src/osmo_gsm_tester/templates/srsue.cfg.tmpl D src/osmo_gsm_tester/test.py A suites/4g/mo_mt_sms.py A suites/4g/suite.conf D update_version.sh 7 files changed, 403 insertions(+), 136 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/17067/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index a9eaf7a..f263784 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -142,10 +142,18 @@ cd "$dep/${dir}" - set +x; echo; echo; set -x - autoreconf -fi - set +x; echo; echo; set -x - ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $CONFIGURE_FLAGS $configure_opts + if [ -f configure.ac ]; then + set +x; echo; echo; set -x + autoreconf -fi + set +x; echo; echo; set -x + ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $CONFIGURE_FLAGS $configure_opts + elif [ -f CMakeLists.txt ]; then + rm -rf build && mkdir build && cd build || exit 1 + set +x; echo; echo; set -x + cmake ../ -DCMAKE_INSTALL_PREFIX=$prefix $CONFIGURE_FLAGS $configure_opts + else + echo "Unknwown build system" && exit 1 + fi set +x; echo; echo; set -x make -j8 || make # libsmpp34 can't build in parallel set +x; echo; echo; set -x @@ -213,6 +221,9 @@ prune_files bin "$wanted_binaries_bin" prune_files sbin "$wanted_binaries_sbin" + # Drop all static libraries if exist: + rm -f $prefix_real/lib/*.a + rm -f $prefix_real/lib/*.la cd "$prefix_real" add_rpath diff --git a/contrib/jenkins-build-srslte.sh b/contrib/jenkins-build-srslte.sh new file mode 100755 index 0000000..705e4ab --- /dev/null +++ b/contrib/jenkins-build-srslte.sh @@ -0,0 +1,13 @@ +#!/bin/sh +set -e -x + +base="$PWD" +name="srslte" +SANITIZE_FLAGS="" +git_url="https://github.com/srsLTE/" +. "$(dirname "$0")/jenkins-build-common.sh" + +#TODO: make sure libconfig, zeroMQ is installed +build_repo srsLTE ${SANITIZE_FLAGS} + +create_bin_tgz "srsue srsenb srsepc" diff --git a/src/osmo_gsm_tester/templates/srsue.cfg.tmpl b/src/osmo_gsm_tester/templates/srsue.cfg.tmpl new file mode 100644 index 0000000..0afa78b --- /dev/null +++ b/src/osmo_gsm_tester/templates/srsue.cfg.tmpl @@ -0,0 +1,347 @@ +##################################################################### +# srsUE configuration file +##################################################################### + +##################################################################### +# RF configuration +# +# dl_earfcn: Downlink EARFCN code. +# freq_offset: Uplink and Downlink optional frequency offset (in Hz) +# tx_gain: Transmit gain (dB). +# rx_gain: Optional receive gain (dB). If disabled, AGC if enabled +# +# Optional parameters: +# dl_freq: Override DL frequency corresponding to dl_earfcn +# ul_freq: Override UL frequency corresponding to dl_earfcn +# nof_radios: Number of available RF devices +# nof_rf_channels: Number of RF channels per radio +# nof_rx_ant: Number of RX antennas per channel +# device_name: Device driver family. Supported options: "auto" (uses first found), "UHD" or "bladeRF" +# device_args: Arguments for the device driver. Options are "auto" or any string. +# Default for UHD: "recv_frame_size=9232,send_frame_size=9232" +# Default for bladeRF: "" +# device_args_2: Arguments for the RF device driver 2. +# device_args_3: Arguments for the RF device driver 3. +# time_adv_nsamples: Transmission time advance (in number of samples) to compensate for RF delay +# from antenna to timestamp insertion. +# Default "auto". B210 USRP: 100 samples, bladeRF: 27. +# burst_preamble_us: Preamble length to transmit before start of burst. +# Default "auto". B210 USRP: 400 us, bladeRF: 0 us. +# continuous_tx: Transmit samples continuously to the radio or on bursts (auto/yes/no). +# Default is auto (yes for UHD, no for rest) +##################################################################### +[rf] +dl_earfcn = 3400 +freq_offset = 0 +tx_gain = 80 +#rx_gain = 40 + +#nof_radios = 1 +#nof_rx_ant = 1 + +# For best performance in 2x2 MIMO and >= 15 MHz use the following device_args settings: +# USRP B210: num_recv_frames=64,num_send_frames=64 + +# For best performance when BW<5 MHz (25 PRB), use the following device_args settings: +# USRP B210: send_frame_size=512,recv_frame_size=512 + +#device_args = auto +#time_adv_nsamples = auto +#burst_preamble_us = auto +#continuous_tx = auto + + +##################################################################### +# Packet capture configuration +# +# Packet capture is supported at both MAC and NAS layers. +# MAC-layer packets are captured to file in the compact format +# decoded by the Wireshark mac-lte-framed dissector. +# To use this dissector, edit the preferences for DLT_USER to +# add an entry with DLT=147, Payload Protocol=mac-lte-framed. +# For more information see: https://wiki.wireshark.org/MAC-LTE +# NAS-layer packets are dissected with DLT=148, and +# Payload Protocol = nas-eps. +# +# enable: Enable MAC layer packet captures (true/false) +# filename: File path to use for MAC packet captures +# nas_enable: Enable NAS layer packet captures (true/false) +# nas_filename: File path to use for NAS packet captures +##################################################################### +[pcap] +enable = false +filename = /tmp/ue.pcap +nas_enable = false +nas_filename = /tmp/nas.pcap + +##################################################################### +# Log configuration +# +# Log levels can be set for individual layers. "all_level" sets log +# level for all layers unless otherwise configured. +# Format: e.g. phy_level = info +# +# In the same way, packet hex dumps can be limited for each level. +# "all_hex_limit" sets the hex limit for all layers unless otherwise +# configured. +# Format: e.g. phy_hex_limit = 32 +# +# Logging layers: rf, phy, mac, rlc, pdcp, rrc, nas, gw, usim, all +# Logging levels: debug, info, warning, error, none +# +# filename: File path to use for log output. Can be set to stdout +# to print logs to standard output +# file_max_size: Maximum file size (in kilobytes). When passed, multiple files are created. +# If set to negative, a single log file will be created. +##################################################################### +[log] +all_level = warning +phy_lib_level = none +all_hex_limit = 32 +filename = /tmp/ue.log +file_max_size = -1 + +##################################################################### +# USIM configuration +# +# mode: USIM mode (soft/pcsc) +# algo: Authentication algorithm (xor/milenage) +# op/opc: 128-bit Operator Variant Algorithm Configuration Field (hex) +# - Specify either op or opc (only used in milenage) +# k: 128-bit subscriber key (hex) +# imsi: 15 digit International Mobile Subscriber Identity +# imei: 15 digit International Mobile Station Equipment Identity +# pin: PIN in case real SIM card is used +# reader: Specify card reader by it's name as listed by 'pcsc_scan'. If empty, try all available readers. +##################################################################### +[usim] +mode = soft +algo = xor +#opc = 63BFA50EE6523365FF14C1F45F88737D +k = 00112233445566778899aabbccddeeff +imsi = 001010123456789 +imei = 353490069873319 +#reader = +#pin = 1234 + +##################################################################### +# RRC configuration +# +# ue_category: Sets UE category (range 1-5). Default: 4 +# release: UE Release (8 to 10) +# feature_group: Hex value of the featureGroupIndicators field in the +# UECapabilityInformation message. Default 0xe6041000 +# mbms_service_id: MBMS service id for autostarting MBMS reception +# (default -1 means disabled) +# mbms_service_port: Port of the MBMS service +##################################################################### +[rrc] +#ue_category = 4 +#release = 8 +#feature_group = 0xe6041000 +#mbms_service_id = -1 +#mbms_service_port = 4321 + +##################################################################### +# NAS configuration +# +# apn: Set Access Point Name (APN) +# apn_protocol: Set APN protocol (IPv4, IPv6 or IPv4v6.) +# user: Username for CHAP authentication +# pass: Password for CHAP authentication +# force_imsi_attach: Whether to always perform an IMSI attach +# eia: List of integrity algorithms included in UE capabilities +# Supported: 1 - Snow3G, 2 - AES +# eea: List of ciphering algorithms included in UE capabilities +# Supported: 0 - NULL, 1 - Snow3G, 2 - AES +##################################################################### +[nas] +#apn = internetinternet +#apn_protocol = ipv4 +#user = srsuser +#pass = srspass +#force_imsi_attach = false +#eia = 1,2 +#eea = 0,1,2 + +##################################################################### +# GW configuration +# +# netns: Network namespace to create TUN device. Default: empty +# ip_devname: Name of the tun_srsue device. Default: tun_srsue +# ip_netmask: Netmask of the tun_srsue device. Default: 255.255.255.0 +##################################################################### +[gw] +#netns = +#ip_devname = tun_srsue +#ip_netmask = 255.255.255.0 + +##################################################################### +# GUI configuration +# +# Simple GUI displaying PDSCH constellation and channel freq response. +# (Requires building with srsGUI) +# enable: Enable the graphical interface (true/false) +##################################################################### +[gui] +enable = false + +##################################################################### +# Channel emulator options: +# enable: Enable/Disable internal Downlink/Uplink channel emulator +# +# -- Fading emulator +# fading.enable: Enable/disable fading simulator +# fading.model: Fading model + maximum doppler (E.g. none, epa5, eva70, etu300, etc) +# +# -- Delay Emulator delay(t) = delay_min + (delay_max - delay_min) * (1 + sin(2pi*t/period)) / 2 +# Maximum speed [m/s]: (delay_max - delay_min) * pi * 300 / period +# delay.enable: Enable/disable delay simulator +# delay.period_s: Delay period in seconds. +# delay.init_time_s: Delay initial time in seconds. +# delay.maximum_us: Maximum delay in microseconds +# delay.minumum_us: Minimum delay in microseconds +# +# -- Radio-Link Failure (RLF) Emulator +# rlf.enable: Enable/disable RLF simulator +# rlf.t_on_ms: Time for On state of the channel (ms) +# rlf.t_off_ms: Time for Off state of the channel (ms) +# +# -- High Speed Train Doppler model simulator +# hst.enable: Enable/Disable HST simulator +# hst.period_s: HST simulation period in seconds +# hst.fd_hz: Doppler frequency in Hz +# hst.init_time_s: Initial time in seconds +##################################################################### +[channel.dl] +#enable = false + +[channel.dl.fading] +#enable = false +#model = none + +[channel.dl.delay] +#enable = false +#period_s = 3600 +#init_time_s = 0 +#maximum_us = 100 +#minimum_us = 10 + +[channel.dl.rlf] +#enable = false +#t_on_ms = 10000 +#t_off_ms = 2000 + +[channel.dl.hst] +#enable = false +#period_s = 7.2 +#fd_hz = 750.0 +#init_time_s = 0.0 + +[channel.ul] +#enable = false + +[channel.ul.fading] +#enable = false +#model = none + +[channel.ul.delay] +#enable = false +#period_s = 3600 +#init_time_s = 0 +#maximum_us = 100 +#minimum_us = 10 + +[channel.ul.rlf] +#enable = false +#t_on_ms = 10000 +#t_off_ms = 2000 + +[channel.ul.hst] +#enable = false +#period_s = 7.2 +#fd_hz = -750.0 +#init_time_s = 0.0 + +##################################################################### +# PHY configuration options +# +# rx_gain_offset: RX Gain offset to add to rx_gain to calibrate RSRP readings +# prach_gain: PRACH gain (dB). If defined, forces a gain for the tranmsission of PRACH only., +# Default is to use tx_gain in [rf] section. +# cqi_max: Upper bound on the maximum CQI to be reported. Default 15. +# cqi_fixed: Fixes the reported CQI to a constant value. Default disabled. +# snr_ema_coeff: Sets the SNR exponential moving average coefficient (Default 0.1) +# snr_estim_alg: Sets the noise estimation algorithm. (Default refs) +# Options: pss: use difference between received and known pss signal, +# refs: use difference between noise references and noiseless (after filtering) +# empty: use empty subcarriers in the boarder of pss/sss signal +# pdsch_max_its: Maximum number of turbo decoder iterations (Default 4) +# nof_phy_threads: Selects the number of PHY threads (maximum 4, minimum 1, default 2) +# equalizer_mode: Selects equalizer mode. Valid modes are: "mmse", "zf" or any +# non-negative real number to indicate a regularized zf coefficient. +# Default is MMSE. +# sfo_ema: EMA coefficient to average sample offsets used to compute SFO +# sfo_correct_period: Period in ms to correct sample time to adjust for SFO +# sss_algorithm: Selects the SSS estimation algorithm. Can choose between +# {full, partial, diff}. +# estimator_fil_auto: The channel estimator smooths the channel estimate with an adaptative filter. +# estimator_fil_stddev: Sets the channel estimator smooth gaussian filter standard deviation. +# estimator_fil_order: Sets the channel estimator smooth gaussian filter order (even values perform better). +# The taps are [w, 1-2w, w] +# +# snr_to_cqi_offset: Sets an offset in the SNR to CQI table. This is used to adjust the reported CQI. +# +# pregenerate_signals: Pregenerate uplink signals after attach. Improves CPU performance. +# +# interpolate_subframe_enabled: Interpolates in the time domain the channel estimates within 1 subframe. Default is to average. +# +# sic_pss_enabled: Applies Successive Interference Cancellation to PSS signals when searching for neighbour cells. +# Must be disabled if cells have identical channel and timing, for instance if generated from +# the same source. +# +# pdsch_csi_enabled: Stores the Channel State Information and uses it for weightening the softbits. It is only +# used in TM1. It is True by default. +# +# pdsch_8bit_decoder: Use 8-bit for LLR representation and turbo decoder trellis computation (Experimental) +# force_ul_amplitude: Forces the peak amplitude in the PUCCH, PUSCH and SRS (set 0.0 to 1.0, set to 0 or negative for disabling) +# +##################################################################### +[phy] +#rx_gain_offset = 62 +#prach_gain = 30 +#cqi_max = 15 +#cqi_fixed = 10 +#snr_ema_coeff = 0.1 +#snr_estim_alg = refs +#pdsch_max_its = 8 # These are half iterations +#nof_phy_threads = 3 +#equalizer_mode = mmse +#sfo_ema = 0.1 +#sfo_correct_period = 10 +#sss_algorithm = full +#estimator_fil_auto = false +#estimator_fil_stddev = 1.0 +#estimator_fil_order = 4 +#snr_to_cqi_offset = 0.0 +#interpolate_subframe_enabled = false +#sic_pss_enabled = true +#pregenerate_signals = false +#pdsch_csi_enabled = true +#pdsch_8bit_decoder = false +#force_ul_amplitude = 0 + +##################################################################### +# General configuration options +# +# metrics_csv_enable: Write UE metrics to CSV file. +# +# metrics_period_secs: Sets the period at which metrics are requested from the UE. +# +# metrics_csv_filename: File path to use for CSV metrics. +# +##################################################################### +[general] +#metrics_csv_enable = false +#metrics_period_secs = 1 +#metrics_csv_filename = /tmp/ue_metrics.csv diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py deleted file mode 100644 index 4d4353a..0000000 --- a/src/osmo_gsm_tester/test.py +++ /dev/null @@ -1,122 +0,0 @@ -# osmo_gsm_tester: test class -# -# Copyright (C) 2017 by sysmocom - s.f.m.c. GmbH -# -# Author: Pau Espin Pedrol -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import os -import sys -import time -import traceback -from . import testenv - -from . import log, util, resource - -class Test(log.Origin): - UNKNOWN = 'UNKNOWN' - SKIP = 'skip' - PASS = 'pass' - FAIL = 'FAIL' - - def __init__(self, suite_run, test_basename): - self.basename = test_basename - super().__init__(log.C_TST, self.basename) - self._run_dir = None - self.suite_run = suite_run - self.path = os.path.join(self.suite_run.definition.suite_dir, self.basename) - self.status = Test.UNKNOWN - self.start_timestamp = 0 - self.duration = 0 - self.fail_type = None - self.fail_message = None - self.log_target = None - - def get_run_dir(self): - if self._run_dir is None: - self._run_dir = util.Dir(self.suite_run.get_run_dir().new_dir(self._name)) - return self._run_dir - - def run(self): - try: - self.log_target = log.FileLogTarget(self.get_run_dir().new_child('log')).set_all_levels(log.L_DBG).style_change(trace=True) - log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3) - self.status = Test.UNKNOWN - self.start_timestamp = time.time() - from . import suite, sms, process - from .event_loop import MainLoop - testenv.setup(self.suite_run, self, suite, MainLoop, sms, process) - with self.redirect_stdout(): - util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename), - self.path) - if self.status == Test.UNKNOWN: - self.set_pass() - except Exception as e: - if hasattr(e, 'msg'): - msg = e.msg - else: - msg = str(e) - if isinstance(e, AssertionError): - # AssertionError lacks further information on what was - # asserted. Find the line where the code asserted: - msg += log.get_src_from_exc_info(sys.exc_info()) - # add source file information to failure report - if hasattr(e, 'origins'): - msg += ' [%s]' % e.origins - tb_str = traceback.format_exc() - if isinstance(e, resource.NoResourceExn): - tb_str += self.suite_run.resource_status_str() - self.set_fail(type(e).__name__, msg, tb_str, log.get_src_from_exc_info()) - except BaseException as e: - # when the program is aborted by a signal (like Ctrl-C), escalate to abort all. - self.err('TEST RUN ABORTED: %s' % type(e).__name__) - raise - finally: - if self.log_target: - self.log_target.remove() - self.log_target = None - - def name(self): - l = log.get_line_for_src(self.path) - if l is not None: - return '%s:%s' % (self._name, l) - return super().name() - - def set_fail(self, fail_type, fail_message, tb_str=None, src=4): - self.status = Test.FAIL - self.duration = time.time() - self.start_timestamp - self.fail_type = fail_type - self.fail_message = fail_message - - if tb_str is None: - # populate an exception-less call to set_fail() with traceback info - tb_str = ''.join(traceback.format_stack()[:-1]) - - self.fail_tb = tb_str - self.err('%s: %s' % (self.fail_type, self.fail_message), _src=src) - if self.fail_tb: - self.log(self.fail_tb, _level=log.L_TRACEBACK) - self.log('Test FAILED (%.1f sec)' % self.duration) - - def set_pass(self): - self.status = Test.PASS - self.duration = time.time() - self.start_timestamp - self.log('Test passed (%.1f sec)' % self.duration) - - def set_skip(self): - self.status = Test.SKIP - self.duration = 0 - -# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/suites/4g/mo_mt_sms.py b/suites/4g/mo_mt_sms.py new file mode 100755 index 0000000..8aa4357 --- /dev/null +++ b/suites/4g/mo_mt_sms.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +#epc = suite.epc() +#enb = suite.enb() +ue = suite.modem() + +#enb.start() +#epc.enb_add(enb) +#epc.start() + +#wait(epc.enb_is_connected, enb) + +#hss/epc.subscriber_add(ue) + +#ue.connect(epc.mcc_mnc()) +ue.connect() + + +print('waiting for modem to attach...') +#wait(ue.is_connected, msc.mcc_mnc()) +sleep(10) diff --git a/suites/4g/suite.conf b/suites/4g/suite.conf new file mode 100644 index 0000000..c55b610 --- /dev/null +++ b/suites/4g/suite.conf @@ -0,0 +1,6 @@ +resources: + ip_address: + - times: 1 + modem: + - times: 1 + type: srsue diff --git a/update_version.sh b/update_version.sh deleted file mode 100755 index 3d5fe42..0000000 --- a/update_version.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -git describe --abbrev=8 --dirty | sed 's/v\([^-]*\)-\([^-]*\)-\(.*\)/\1.dev\2.\3/' > version -cat version -echo "# osmo-gsm-tester version. -# Automatically generated by update_version.sh. -# Gets imported by __init__.py. - -_version = '$(cat version)'" \ - > src/osmo_gsm_tester/_version.py -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id9d63920a44a80af187e649c9be5fd7498fa5f44 Gerrit-Change-Number: 17067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:38:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:38:27 +0000 Subject: Change in osmo-ci[master]: jobs: Introduce osmo-gsm-tester_build-srslte References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17068 ) Change subject: jobs: Introduce osmo-gsm-tester_build-srslte ...................................................................... jobs: Introduce osmo-gsm-tester_build-srslte Change-Id: I08a59c6065ca4fb6fbbed5b12e73abf4024f1dcb --- M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml M jobs/osmo-gsm-tester-trigger.yml 3 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/17068/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 470aed0..a519f93 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -29,6 +29,7 @@ triggered-by: master-osmo-bts - osmo-pcu-oc2g: triggered-by: master-osmo-pcu + - srslte triggered-by: 'master-{repo}' jobs: @@ -99,6 +100,8 @@ name: OSMO_GSM_TESTER_BUILD_osmo_trx - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmocom_bb + - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_srslte scm: - osmo-gsm-tester-repo diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index a4b64fd..4a47c8e 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -86,6 +86,8 @@ repo: osmo-gsm-tester_build-osmo-bts-oc2g - copy_artifact: repo: osmo-gsm-tester_build-osmo-pcu-oc2g + - copy_artifact: + repo: osmo-gsm-tester_build-srslte - defaults: name: runner @@ -128,6 +130,7 @@ - osmo-gsm-tester_build-osmo-pcu-sysmo - osmo-gsm-tester_build-osmo-bts-oc2g - osmo-gsm-tester_build-osmo-pcu-oc2g + - osmo-gsm-tester_build-srslte builders: - copy_artifact_all - shell: !include-raw: osmo-gsm-tester_run-{stage}.sh diff --git a/jobs/osmo-gsm-tester-trigger.yml b/jobs/osmo-gsm-tester-trigger.yml index 43298dc..e37c1f1 100644 --- a/jobs/osmo-gsm-tester-trigger.yml +++ b/jobs/osmo-gsm-tester-trigger.yml @@ -29,3 +29,4 @@ osmo-gsm-tester_build-osmo-pcu-sysmo, osmo-gsm-tester_build-osmo-bts-oc2g, osmo-gsm-tester_build-osmo-pcu-oc2g + osmo-gsm-tester_build-srslte -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08a59c6065ca4fb6fbbed5b12e73abf4024f1dcb Gerrit-Change-Number: 17068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:58:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:58:11 +0000 Subject: Change in osmo-ci[master]: Install srsLTE build dependencies in jenkins buildhosts References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17069 ) Change subject: Install srsLTE build dependencies in jenkins buildhosts ...................................................................... Install srsLTE build dependencies in jenkins buildhosts Change-Id: Ib42987416ee90868ab088bfa2f92d92c764088b0 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/17069/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index daec1f6..bfa9715 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -133,3 +133,19 @@ - libjansson-dev - libulfius-dev when: ansible_distribution == 'Debian' and ansible_distribution_version == '9' + +- name: install srsLTE build dependencies + apt: + name: "{{ item }}" + cache_valid_time: 3600 + update_cache: yes + with_items: + - cmake + - libfftw3-dev + - libmbedtls-dev + - libboost-program-options-dev + - libconfig++-dev + - libsctp-dev + - libpcsclite-dev + - libuhd-dev + - libczmq-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib42987416ee90868ab088bfa2f92d92c764088b0 Gerrit-Change-Number: 17069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jan 29 18:58:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jan 2020 18:58:12 +0000 Subject: Change in osmo-ci[master]: ansible: mdbus2 is not nowadays available on Debian10 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17070 ) Change subject: ansible: mdbus2 is not nowadays available on Debian10 ...................................................................... ansible: mdbus2 is not nowadays available on Debian10 Change-Id: I0eb2ed28d9e3bc9054ffeb81c9e6fb5428af5bfb --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/17070/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 5cc83bc..83b3db6 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -33,10 +33,17 @@ - libsofia-sip-ua-glib-dev - libsqlite3-dev - libasound2-dev - - mdbus2 - liblua5.3-dev - lua-socket +# mdbus2 is not available in debian10. TODO: compile it for >9 +- name: install mdbus2 + apt: + name: "{{ item }}" + with_items: + - mdbus2 + when: ansible_distribution == 'Debian' and ansible_distribution_version <= '9' + - name: install srsLTE runtime dependencies apt: name: "{{ item }}" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0eb2ed28d9e3bc9054ffeb81c9e6fb5428af5bfb Gerrit-Change-Number: 17070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 04:56:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 04:56:53 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add scripts to build srsLTE software In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 ) Change subject: contrib: Add scripts to build srsLTE software ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067/1/contrib/jenkins-build-common.sh File contrib/jenkins-build-common.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067/1/contrib/jenkins-build-common.sh at 153 PS1, Line 153: cmake Ah, cmake is so different... - it's better to have the source path in the end: cmake -DCMAKE_INSTALL_PREFIX=$prefix ../ - CC / CXX and CFLAGS / CXXFLAGS variables need to be set before calling cmake: CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=$prefix ../ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id9d63920a44a80af187e649c9be5fd7498fa5f44 Gerrit-Change-Number: 17067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 30 Jan 2020 04:56:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 05:51:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 05:51:47 +0000 Subject: Change in osmo-hlr[master]: gsup_client.c: fix deprecation for client create func In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17057 ) Change subject: gsup_client.c: fix deprecation for client create func ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iab9f416519b5df3bd4683592b2976f16675d9be7 Gerrit-Change-Number: 17057 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 30 Jan 2020 05:51:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 07:38:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 07:38:43 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 28: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c File src/gsupclient/gsup_req.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/26/src/gsupclient/gsup_req.c at 110 PS26, Line 110: msgb_free(req->msg); > Have we done this elsewhere before? Not yet, but I don't see any problems. > But msgb are a bit different, AFAIU they're all part of a separate msgb talloc context It's just a context msgb_alloc() uses by default. There is also msgb_alloc_c(). -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 07:38:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:15:04 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 09:15:04 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default ...................................................................... mslookup_client_mdns_test: disable by default Only build and run the test, if --enable-mslookup-client-mdns-test is passed to ./configure. Enable that option in jenkins.sh. Related: OS#4385 Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 --- M configure.ac M contrib/jenkins.sh M tests/mslookup/Makefile.am M tests/testsuite.at 4 files changed, 29 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/71/17071/1 diff --git a/configure.ac b/configure.ac index 59261e8..34c5163 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,15 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# mslookup_client_mdns_test (OS#4385: does not work everywhere) +AC_ARG_ENABLE([mslookup_client_mdns_test], + AC_HELP_STRING([--enable-mslookup-client-mdns-test], + [Include the mslookup_client_mdns_test in make check [default=no]]), + [enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"]) +AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test]) +AC_MSG_RESULT([$enable_mslookup_client_mdns_test]) +AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes") + # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5914182..522d72e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -49,7 +49,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure \ + --enable-sanitize \ + --enable-external-tests \ + --enable-mslookup-client-mdns-test \ + --enable-werror \ + $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index ebf2add..04778e8 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -24,7 +24,6 @@ check_PROGRAMS = \ mdns_test \ - mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -45,14 +44,6 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -mslookup_client_mdns_test_SOURCES = \ - mslookup_client_mdns_test.c \ - $(NULL) -mslookup_client_mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - mdns_test_SOURCES = \ mdns_test.c \ $(NULL) @@ -61,6 +52,18 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST +check_PROGRAMS += mslookup_client_mdns_test + +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) +endif + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/testsuite.at b/tests/testsuite.at index 827e9f8..d30b5e9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -58,7 +58,9 @@ AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP +# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385) AT_SETUP([mslookup_client_mdns]) +AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ]) AT_KEYWORDS([mslookup_client_mdns]) cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:15:05 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 09:15:05 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns_test: no automatic skip References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17072 ) Change subject: mslookup_client_mdns_test: no automatic skip ...................................................................... mslookup_client_mdns_test: no automatic skip Exit with error code if multicast is disabled. The test is disabled by default already, so when explicitly enabling it, we should not automatically skip it. Related: OS#4385 Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b --- M tests/mslookup/mslookup_client_mdns_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/72/17072/1 diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c index f33ef98..5e558b4 100644 --- a/tests/mslookup/mslookup_client_mdns_test.c +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -225,8 +225,8 @@ int main() { if (!is_multicast_enabled()) { - fprintf(stderr, "WARNING: multicast is disabled, skipping the test! (OS#4361)"); - return 77; + fprintf(stderr, "ERROR: multicast is disabled! (OS#4361)"); + return 1; } talloc_enable_null_tracking(); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b Gerrit-Change-Number: 17072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:36:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 09:36:49 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 30 Jan 2020 09:36:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:37:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 09:37:42 +0000 Subject: Change in osmo-hlr[master]: mslookup_client_mdns_test: no automatic skip In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17072 ) Change subject: mslookup_client_mdns_test: no automatic skip ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b Gerrit-Change-Number: 17072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 30 Jan 2020 09:37:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:45:04 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 09:45:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 to look at the new patch set (#3). Change subject: hlr: new test: TC_MSLookup_GSUP_proxy ...................................................................... hlr: new test: TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and another HLR during Location Update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 142 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:45:18 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 09:45:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: new test: TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 ) Change subject: hlr: new test: TC_MSLookup_GSUP_proxy ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064/1/hlr/HLR_Tests.ttcn at 1663 PS1, Line 1663: > maybe add comment: [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Thu, 30 Jan 2020 09:45:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:51:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 09:51:16 +0000 Subject: Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16206 ) Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() ...................................................................... Patch Set 28: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h File include/osmocom/gsupclient/gsup_client.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h at 62 PS28, Line 62: osmo_gsup_client_config That's a nice idea to finally group all parameters into a structure! https://gerrit.osmocom.org/c/osmo-hlr/+/16206/28/include/osmocom/gsupclient/gsup_client.h at 69 PS28, Line 69: tcp_port Just an idea: what if somebody wants to use a different transport layer, e.g. SCTP? We could make the new function more flexible by adding an enumerated type (osmo_gsup_transport_proto?) and a union to this structure: ... enum osmo_gsup_transport_proto transport_proto; const char *ip_addr; union { struct tcp_ipa { struct ipaccess_unit *ipa_dev; unsigned int port; } } u; ... For now osmo_gsup_client_create3() would return -ENOTSUPP for transport_proto != TCP_IPA. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 09:51:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 09:53:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 09:53:10 +0000 Subject: Change in simtrace2[master]: remsim: allow selecting pcsc reader number In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Thu, 30 Jan 2020 09:53:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 10:16:45 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 10:16:45 +0000 Subject: Change in simtrace2[master]: remsim: allow selecting pcsc reader number In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Thu, 30 Jan 2020 10:16:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 10:21:15 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 10:21:15 +0000 Subject: Change in libosmocore[master]: pcsc: don't leak memory In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 30 Jan 2020 10:21:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 10:21:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 10:21:36 +0000 Subject: Change in simtrace2[master]: remsim: allow selecting pcsc reader number In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17059 ) Change subject: remsim: allow selecting pcsc reader number ...................................................................... remsim: allow selecting pcsc reader number The number can be queried using pcsc_scan -n Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e --- M host/src/simtrace2-remsim.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index 7d5ecd3..201ff71 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -182,6 +182,7 @@ "\t-i\t--gsmtap-ip\tA.B.C.D\n" "\t-a\t--skip-atr\n" "\t-k\t--keep-running\n" + "\t-n\t--pcsc-reader-num\n" "\t-V\t--usb-vendor\tVENDOR_ID\n" "\t-P\t--usb-product\tPRODUCT_ID\n" "\t-C\t--usb-config\tCONFIG_ID\n" @@ -200,6 +201,7 @@ { "skip-atr", 0, 0, 'a' }, { "help", 0, 0, 'h' }, { "keep-running", 0, 0, 'k' }, + { "pcsc-reader-num", 1, 0, 'n' }, { "usb-vendor", 1, 0, 'V' }, { "usb-product", 1, 0, 'P' }, { "usb-config", 1, 0, 'C' }, @@ -285,6 +287,7 @@ int remote_udp_port = 52342; int if_num = 0, vendor_id = -1, product_id = -1; int config_id = -1, altsetting = 0, addr = -1; + int reader_num = 0; char *remote_udp_host = NULL; char *path = NULL; struct osim_reader_hdl *reader; @@ -295,7 +298,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:ak", opts, &option_index); + c = getopt_long(argc, argv, "r:p:hi:V:P:C:I:S:A:H:akn:", opts, &option_index); if (c == -1) break; switch (c) { @@ -318,6 +321,9 @@ case 'k': keep_running = 1; break; + case 'n': + reader_num = atoi(optarg); + break; case 'V': vendor_id = strtol(optarg, NULL, 16); break; @@ -373,7 +379,7 @@ goto close_exit; } - reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL); + reader = osim_reader_open(OSIM_READER_DRV_PCSC, reader_num, "", NULL); if (!reader) { perror("unable to open PC/SC reader"); goto close_exit; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9d347501a9f181f68e74799ad04a810553eb2c9e Gerrit-Change-Number: 17059 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 11:24:29 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 11:24:29 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#31) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 537 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/31 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 31 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 11:24:29 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 11:24:29 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#23) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 21 files changed, 2,005 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/23 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 12:20:19 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 30 Jan 2020 12:20:19 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16945 to look at the new patch set (#7). Change subject: Fixed update_hplmn_act method ...................................................................... Fixed update_hplmn_act method Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 12:22:12 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 30 Jan 2020 12:22:12 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: > Patch Set 4: Code-Review+2 A quick question regarding the merging of patches, am I supposed to merge these changes or the reviewers will merge them? If it is the former, could someone please let me know how to do it? Many thanks!! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jan 2020 12:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:38:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jan 2020 15:38:55 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: > Patch Set 4: > > > Patch Set 4: Code-Review+2 > > A quick question regarding the merging of patches, am I supposed to merge these changes or the reviewers will merge them? If it is the former, could someone please let me know how to do it? > > Many thanks!! We usually follow these rules: https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit/#Voting-Rules-for-merging-a-patch-to-master. As soon as your change and *its predecessors* get at least CR+1+2, you can merge it yourself (Submit button is what you're looking for). If you don't have time, I could take care about this patch set on holidays. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jan 2020 15:38:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:52:01 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:52:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_home In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 to look at the new patch set (#10). Change subject: hlr: add TC_MSLookup_mDNS_service_other_home ...................................................................... hlr: add TC_MSLookup_mDNS_service_other_home Send an mslookup mDNS request to the home HLR, asking about a service that is not "gsup.hlr". Hence the "_other" in the test name, service "gsup.hlr" has different code paths, and related tests will be added in follow-up patches. This is the first test using MSLookup_mDNS_Emulation, so add related test infrastructure. Related: OS#4380 Depends: osmo-hlr I2fe453553c90e6ee527ed13a13089900efd488aa Change-Id: Ia7f92d33691f910549353b16a7b0efc18e521719 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.default M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M hlr/regen_makefile.sh A library/MSLookup_mDNS_Emulation.ttcn A library/MSLookup_mDNS_Templates.ttcn A library/MSLookup_mDNS_Types.ttcn 8 files changed, 275 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/16914/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:52:01 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:52:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 to look at the new patch set (#4). Change subject: hlr: add TC_MSLookup_GSUP_proxy ...................................................................... hlr: add TC_MSLookup_GSUP_proxy Let OsmoHLR act as proxy between MSC and home HLR during Location update. Related: OS#4380 Change-Id: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 --- M hlr/HLR_Tests.ttcn M hlr/gen_links.sh M library/MSLookup_mDNS_Templates.ttcn 3 files changed, 148 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/17064/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:52:05 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:52:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_home References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17073 ) Change subject: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_home ...................................................................... hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_home Request "gsup.hlr" service right after creating subscriber from the home HLR. "TC_MSLookup_mDNS_service_other_home" is similar, but does not query the "gsup.hlr" service. The "gsup.hlr" service has a different code path in OsmoHLR: - it exists without being explicitly configured and returns the IP and port of the HLR's own GSUP server - the request is answered, even if the subscriber is not attached to the HLR (for Location Update via proxy) Related: OS#4380 Change-Id: Id567989e4be7ac2d3857d3ea61a1ca3a2401a8dc --- M hlr/HLR_Tests.ttcn 1 file changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/17073/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 82c74f4..c8c6712 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -1715,6 +1715,49 @@ } } +/* Request "gsup.hlr" service right after creating subscriber from the home HLR. "TC_MSLookup_mDNS_service_other_home" + * is similar, but does not query the "gsup.hlr" service. The "gsup.hlr" service has a different code path in OsmoHLR: + * - it exists without being explicitly configured and returns the IP and port of the HLR's own GSUP server + * - the request is answered, even if the subscriber is not attached to the HLR (for Location Update via proxy) */ +private function f_TC_MSLookup_mDNS_service_GSUP_HLR_home() runs on HLR_ConnHdlr { + timer T; + var MSLookup_mDNS vl_rmsg; + var integer id := f_rnd_int(65535); /* mDNS packet ID */ + var charstring domain := "gsup.hlr." & hex2str(g_pars.sub.imsi) & ".imsi.mdns.osmocom.org"; + + /* Create subscriber */ + g_pars.sub.msisdn := '133713381339'H; + f_vty_subscr_create(VTY, g_pars.sub); + + /* Send mDNS query, expect result */ + mDNS.send(ts_MSLookup_mDNS_query(id, domain)); + T.start(1.0); + alt { + [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, f_enc_IPv4(mp_hlr_ip), mp_hlr_gsup_port)) { + setverdict(pass); + } + [] mDNS.receive(MSLookup_mDNS:?) -> value vl_rmsg { + repeat; + } + [] T.timeout { + setverdict(fail, "OsmoHLR did not answer to mDNS query"); + } + } + + f_vty_subscr_delete(VTY, g_pars.sub); +} +testcase TC_MSLookup_mDNS_service_GSUP_HLR_home() runs on test_CT { + var hexstring imsi := f_rnd_imsi('26242'H); + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi)); + + f_init(false); + f_vty_config(VTY, "mslookup", "mdns bind"); + + vc_conn := f_start_handler(refers(f_TC_MSLookup_mDNS_service_GSUP_HLR_home), pars); + vc_conn.done; +} + /* TODO: * UL with ISD error * UL with ISD timeout @@ -1764,6 +1807,7 @@ if (mp_hlr_supports_dgsm) { execute( TC_MSLookup_mDNS_service_other_home() ); execute( TC_MSLookup_GSUP_proxy() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17073 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: Id567989e4be7ac2d3857d3ea61a1ca3a2401a8dc Gerrit-Change-Number: 17073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:52:06 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:52:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_proxy References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17074 ) Change subject: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_proxy ...................................................................... hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_proxy Ask proxy HLR about gsup.hlr service, and expect no answer. Related: OS#4380 Change-Id: Ic42c909e6540b2294b1109dc19c1df348224457b --- M hlr/HLR_Tests.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/17074/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index c8c6712..e00bd8b 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -1758,6 +1758,47 @@ vc_conn.done; } +/* Ask proxy HLR about gsup.hlr service, and expect no answer. */ +private function f_TC_MSLookup_mDNS_service_GSUP_HLR_proxy() runs on HLR_ConnHdlr { + timer T; + var integer id := f_rnd_int(65535); /* mDNS packet ID */ + var charstring domain := "gsup.hlr." & hex2str(g_pars.sub.imsi) & ".imsi.mdns.osmocom.org"; + + f_perform_UL_proxy(g_pars.sub.imsi, g_pars.sub.msisdn, OSMO_GSUP_CN_DOMAIN_CS); + + /* Send mDNS query, expect timeout */ + mDNS.send(ts_MSLookup_mDNS_query(id, domain)); + T.start(1.0); + alt { + [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, f_enc_IPv4(mp_hlr_ip), mp_hlr_gsup_port)) { + setverdict(fail, "mslookup result received from proxy HLR for gsup.hlr service"); + } + [] mDNS.receive(MSLookup_mDNS:?) { + repeat; + } + [] T.timeout { + setverdict(pass); + } + } +} +testcase TC_MSLookup_mDNS_service_GSUP_HLR_proxy() runs on test_CT { + var hexstring imsi := f_rnd_imsi('26242'H); + var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9); + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi, msisdn)); + + f_init(false, true); + f_vty_config(VTY, "mslookup", "mdns bind"); + vc_conn := f_start_handler(refers(f_TC_MSLookup_mDNS_service_GSUP_HLR_proxy), pars, true); + + timer T := 3.0; + T.start; + alt { + [] vc_conn.done {} + [] T.timeout { setverdict(fail, "Timeout"); mtc.stop; }; + } +} + /* TODO: * UL with ISD error * UL with ISD timeout @@ -1808,6 +1849,7 @@ execute( TC_MSLookup_mDNS_service_other_home() ); execute( TC_MSLookup_GSUP_proxy() ); execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17074 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: Ic42c909e6540b2294b1109dc19c1df348224457b Gerrit-Change-Number: 17074 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:52:07 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:52:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_proxy References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075 ) Change subject: hlr: add TC_MSLookup_mDNS_service_other_proxy ...................................................................... hlr: add TC_MSLookup_mDNS_service_other_proxy Ask proxy HLR about configured sip.voice service, and expect result. Related: OS#4380 Change-Id: I2c956119783972b5e6828bed7554a8a79984d8a2 --- M hlr/HLR_Tests.ttcn 1 file changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/17075/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index e00bd8b..0dd3cad 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -1799,6 +1799,48 @@ } } +/* Ask proxy HLR about configured sip.voice service, and expect result. */ +private function f_TC_MSLookup_mDNS_service_other_proxy() runs on HLR_ConnHdlr { + timer T; + var integer id := f_rnd_int(65535); /* mDNS packet ID */ + var charstring domain := "sip.voice." & hex2str(g_pars.sub.msisdn) & ".msisdn.mdns.osmocom.org"; + + f_perform_UL_proxy(g_pars.sub.imsi, g_pars.sub.msisdn, OSMO_GSUP_CN_DOMAIN_CS); + + /* Send mDNS query, expect result */ + mDNS.send(ts_MSLookup_mDNS_query(id, domain)); + T.start(1.0); + alt { + [] mDNS.receive(tr_MSLookup_mDNS_result_IPv4(id, domain, f_enc_IPv4("66.66.66.66"), 5060)) { + setverdict(pass); + } + [] mDNS.receive(MSLookup_mDNS:?) { + repeat; + } + [] T.timeout { + setverdict(fail, "Timeout"); + } + } +} +testcase TC_MSLookup_mDNS_service_other_proxy() runs on test_CT { + var hexstring imsi := f_rnd_imsi('26242'H); + var hexstring msisdn := '49161'H & f_rnd_hexstring(7, 9); + var HLR_ConnHdlr vc_conn; + var HLR_ConnHdlrPars pars := valueof(t_Pars(imsi, msisdn)); + + f_init(false, true); + f_vty_config(VTY, "mslookup", "mdns bind"); + f_vty_config2(VTY, {"mslookup", "server"}, "service sip.voice at 66.66.66.66 5060"); + vc_conn := f_start_handler(refers(f_TC_MSLookup_mDNS_service_other_proxy), pars, true); + + timer T := 3.0; + T.start; + alt { + [] vc_conn.done {} + [] T.timeout { setverdict(fail, "Timeout"); mtc.stop; }; + } +} + /* TODO: * UL with ISD error * UL with ISD timeout @@ -1850,6 +1892,7 @@ execute( TC_MSLookup_GSUP_proxy() ); execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); + execute( TC_MSLookup_mDNS_service_other_proxy() ); } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075 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: I2c956119783972b5e6828bed7554a8a79984d8a2 Gerrit-Change-Number: 17075 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 15:53:26 2020 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 30 Jan 2020 15:53:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_home In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_service_other_home ...................................................................... Patch Set 10: Test renamed for consistency with new tests in follow-up patches. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 15:53:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:20:33 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:20:33 +0000 Subject: Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2 References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17076 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 ...................................................................... Merge branch 'master' of ssh://og/simtrace2 Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/17076/1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c Gerrit-Change-Number: 17076 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:20:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:20:35 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/77/17077/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3ed1345..7ddfa6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -63,6 +63,8 @@ # make -C "$base/doc/manuals" publish #fi +rm -rf $TOPDIR/firmware/bin/simtrace-cardem* + if [ "x$publish" = "x--publish" ]; then echo echo "=============== UPLOAD BUILD ==============" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:20:37 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:20:37 +0000 Subject: Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2 References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17078 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 ...................................................................... Merge branch 'master' of ssh://og/simtrace2 Change-Id: I934e488d631b083051cb349853a8217e1dc94299 --- 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/78/17078/1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I934e488d631b083051cb349853a8217e1dc94299 Gerrit-Change-Number: 17078 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:22:08 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:22:08 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/77/17077/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:22:46 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:22:46 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/17079 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/79/17079/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3ed1345..7ddfa6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -63,6 +63,8 @@ # make -C "$base/doc/manuals" publish #fi +rm -rf $TOPDIR/firmware/bin/simtrace-cardem* + if [ "x$publish" = "x--publish" ]; then echo echo "=============== UPLOAD BUILD ==============" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f Gerrit-Change-Number: 17079 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:22:58 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:22:58 +0000 Subject: Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2 In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17078 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I934e488d631b083051cb349853a8217e1dc94299 Gerrit-Change-Number: 17078 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:23:23 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:23:23 +0000 Subject: Change in simtrace2[master]: Merge branch 'master' of ssh://og/simtrace2 In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17076 ) Change subject: Merge branch 'master' of ssh://og/simtrace2 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie72fe5300d36290ce5fbdefbc963dac3f7b9f73c Gerrit-Change-Number: 17076 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 16:23:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jan 2020 16:23:35 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17077 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0bf0c28dcca6a7478f6c8f413f015f4cbe6d9a54 Gerrit-Change-Number: 17077 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 17:00:00 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 17:00:00 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#12) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... gprs_gmm_fsm.c: Implement RAT change between 2g and 3g Related: OS#2737 Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 --- M include/osmocom/sgsn/gprs_gmm_fsm.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_fsm.c 3 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/15487/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 17:00:09 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 17:00:09 +0000 Subject: Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 ) Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby ...................................................................... mm_state_gb_fsm: Handle implicit detach from mm_standby Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Related: OS#2737 --- M src/sgsn/gprs_mm_state_gb_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/80/17080/1 diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c index 811f0c2..d3f2ea3 100644 --- a/src/sgsn/gprs_mm_state_gb_fsm.c +++ b/src/sgsn/gprs_mm_state_gb_fsm.c @@ -68,6 +68,9 @@ case E_MM_PDU_RECEPTION: mm_state_gb_fsm_state_chg(fi, ST_MM_READY); break; + case E_MM_IMPLICIT_DETACH: + mm_state_gb_fsm_state_chg(fi, ST_MM_IDLE); + break; } } @@ -86,7 +89,7 @@ .action = st_mm_ready, }, [ST_MM_STANDBY] = { - .in_event_mask = X(E_MM_PDU_RECEPTION), + .in_event_mask = X(E_MM_PDU_RECEPTION) | X(E_MM_IMPLICIT_DETACH), .out_state_mask = X(ST_MM_IDLE) | X(ST_MM_READY), .name = "Standby", .action = st_mm_standby, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Gerrit-Change-Number: 17080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 17:00:09 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 17:00:09 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17081 ) Change subject: gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT ...................................................................... gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT Change-Id: I38cb31907eddeade5350cdb648df179408d908d2 Related: OS#3727 --- M src/sgsn/gprs_gmm.c 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/81/17081/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index f62d0d1..c574dac 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1099,6 +1099,16 @@ osmo_fsm_inst_dispatch(ctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); } +/* Detect if RAT has changed */ +static bool mmctx_did_rat_change(struct sgsn_mm_ctx *mmctx, struct msgb *msg) +{ + if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) + return true; + if (!MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_GERAN_Gb) + return true; + return false; +} + /* 3GPP TS 24.008 ? 9.4.1 Attach request */ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, struct gprs_llc_llme *llme) @@ -1944,6 +1954,23 @@ return rc; } + /* A RAT change is only expected/allowed for RAU/Attach Req */ + if (mmctx && mmctx_did_rat_change(mmctx, msg)) { + switch (gh->msg_type) { + case GSM48_MT_GMM_RA_UPD_REQ: + case GSM48_MT_GMM_ATTACH_REQ: + break; + default: + /* This shouldn't happen with other message types and + * we need to error out to prevent a crash */ + LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping GMM %s which was received on different " + "RAT (mmctx ran_type=%u, msg_iu_ue_ctx=%p\n", + get_value_string(gprs_msgt_gmm_names, gh->msg_type), + mmctx->ran_type, MSG_IU_UE_CTX(msg)); + return -EINVAL; + } + } + /* * For a few messages, mmctx may be NULL. For most, we want to ensure a * non-NULL mmctx. At the same time, we want to keep the message -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I38cb31907eddeade5350cdb648df179408d908d2 Gerrit-Change-Number: 17081 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jan 30 17:00:25 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Jan 2020 17:00:25 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 12: (6 comments) https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c File src/sgsn/gprs_gmm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1232 PS11, Line 1232: if (MSG_IU_UE_CTX(msg) && ctx->ran_type != MM_CTX_T_UTRAN_Iu) > Would be nice adding a comment here like: /* Detect MS switched to new a Radio Access technology */ Done https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1644 PS11, Line 1644: if (MSG_IU_UE_CTX(msg) && mmctx->ran_type != MM_CTX_T_UTRAN_Iu) > The problem overall is, we have to refactor the full Attach Request/RAU logic. [?] Thanks for the clarification. Refactoring the logic belongs in a different patch(set), let's keep this for handling RAT changes and fixing the SGSN crash. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1649 PS11, Line 1649: osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL); > So we need to find out before merging this patch blindly. Seems Lynxis moved the call here from line 1607 so we don't accidentally send messages (and crash) before handling the RAT change. I re-added the call to the code above with a check whether the RAT has changed. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm.c at 1663 PS11, Line 1663: if (!mmctx->gb.llme) > Agree, you probably want to pass new_rat_type, llme and msg. Actually the IMPLICIT_DETACH event causes the gb fsm to to to idle which in turn unassigns the llme and sets it to NULL. However, implicit detach is only handled from the mm_ready state and not from mm_standby. I think we should implement add that to the the gb fsm so we don't need to do this here or in the gmm_fsm. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/9/src/sgsn/gprs_gmm_fsm.c at 173 PS9, Line 173: (enum sgsn_ran_type) data; > I am pretty sure Coverity is not gonna like this this hack... When we pass a struct * as user data this will be resolved. https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c File src/sgsn/gprs_gmm_fsm.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/15487/11/src/sgsn/gprs_gmm_fsm.c at 165 PS11, Line 165: gmm_fsm_state_chg(fi, ST_GMM_DEREGISTERED); > I'm wondering whether the mmctx ran type needs to be set here too, or some stuff needs to be dealloc [?] It looks to me like we should just have a fall-through to the default: case in addition to setting the state to deregistered. There is nothing allocated in this fsm anyway it looks like, so I don't think there's anything to free? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 30 Jan 2020 17:00:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jan 31 04:07:49 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jan 2020 04:07:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e33a82aeaa0d_2dd02b1d355b65f8687135@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 661s] /bin/bash ../libtool --tag=CC --mode=link gcc -Wall -ffast-math -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -version-info 0:1:0 -lfftw3f -Wl,-z,relro -Wl,-z,now -o libosmodsp.la -rpath /usr/lib/x86_64-linux-gnu cfile.lo cxvec.lo cxvec_math.lo iqbal.lo [ 661s] libtool: link: gcc -shared -fPIC -DPIC .libs/cfile.o .libs/cxvec.o .libs/cxvec_math.o .libs/iqbal.o -lfftw3f -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,-soname -Wl,libosmodsp.so.0 -o .libs/libosmodsp.so.0.0.1 [ 661s] libtool: link: (cd ".libs" && rm -f "libosmodsp.so.0" && ln -s "libosmodsp.so.0.0.1" "libosmodsp.so.0") [ 661s] libtool: link: (cd ".libs" && rm -f "libosmodsp.so" && ln -s "libosmodsp.so.0.0.1" "libosmodsp.so") [ 661s] libtool: link: ar cru .libs/libosmodsp.a cfile.o cxvec.o cxvec_math.o iqbal.o [ 661s] ar: `u' modifier ignored since `D' is the default (see `U') [ 661s] libtool: link: ranlib .libs/libosmodsp.a [ 661s] libtool: link: ( cd ".libs" && rm -f "libosmodsp.la" && ln -s "../libosmodsp.la" "libosmodsp.la" ) [ 661s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 661s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 661s] mkdir -p doc [ 661s] /usr/bin/doxygen Doxyfile [ 661s] /usr/bin/doxygen: error while loading shared libraries: libffi.so.7: cannot open shared object file: No such file or directory [ 661s] make[3]: *** [Makefile:931: doc/html/index.html] Error 127 [ 661s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 661s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 661s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 661s] make[1]: *** [Makefile:374: all] Error 2 [ 661s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 661s] dh_auto_build: error: make -j1 returned exit code 2 [ 661s] make: *** [debian/rules:13: build] Error 25 [ 661s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 661s] [ 661s] lamb07 failed "build libosmodsp_0.4.0.dsc" at Fri Jan 31 04:07:31 UTC 2020. [ 661s] [ 661s] ### VM INTERACTION START ### [ 664s] [ 609.809615] sysrq: SysRq : Power Off [ 664s] [ 609.825497] reboot: Power down [ 664s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jan 31 04:16:24 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jan 2020 04:16:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5e33aa296bb33_2dd02b1d355b65f868789a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 139s] dpkg-source --before-build . [ 139s] dpkg-buildpackage: info: host architecture amd64 [ 140s] fakeroot debian/rules clean [ 140s] dh clean --with python3 --buildsystem=pybuild [ 140s] dh_auto_clean -O--buildsystem=pybuild [ 140s] I: pybuild base:217: python3.7 setup.py clean [ 141s] Traceback (most recent call last): [ 141s] File "setup.py", line 18, in [ 141s] from setuptools import setup, find_packages [ 141s] File "/usr/lib/python3/dist-packages/setuptools/__init__.py", line 20, in [ 141s] from setuptools.dist import Distribution, Feature [ 141s] File "/usr/lib/python3/dist-packages/setuptools/dist.py", line 36, in [ 141s] from setuptools import windows_support [ 141s] File "/usr/lib/python3/dist-packages/setuptools/windows_support.py", line 2, in [ 141s] import ctypes [ 141s] File "/usr/lib/python3.7/ctypes/__init__.py", line 7, in [ 141s] from _ctypes import Union, Structure, Array [ 141s] ImportError: libffi.so.7: cannot open shared object file: No such file or directory [ 141s] E: pybuild pybuild:341: clean: plugin distutils failed with: exit code=1: python3.7 setup.py clean [ 141s] dh_auto_clean: error: pybuild --clean -i python{version} -p 3.7 returned exit code 13 [ 141s] make: *** [debian/rules:4: clean] Error 25 [ 141s] dpkg-buildpackage: error: fakeroot debian/rules clean subprocess returned exit status 2 [ 141s] [ 141s] lamb54 failed "build osmo-python-tests_0.0.9.20200131.dsc" at Fri Jan 31 04:16:12 UTC 2020. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 132.774315] sysrq: SysRq : Power Off [ 144s] [ 132.782487] reboot: Power down [ 144s] ### VM INTERACTION END ### -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jan 31 05:56:31 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 31 Jan 2020 05:56:31 +0000 Subject: Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 ) Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby ...................................................................... Patch Set 1: Can you add a more detailed description why it should be handled. E.g. For MS in standby the Routing Area is still known, but not the exact cell. On an Implicit Detach, drop all context similiar to a implicit detach for a MS in ready state. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Gerrit-Change-Number: 17080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 31 Jan 2020 05:56:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 07:32:36 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 31 Jan 2020 07:32:36 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: > Patch Set 4: > > > Patch Set 4: > > > > > Patch Set 4: Code-Review+2 > > > > A quick question regarding the merging of patches, am I supposed to merge these changes or the reviewers will merge them? If it is the former, could someone please let me know how to do it? > > > > Many thanks!! > > We usually follow these rules: https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit/#Voting-Rules-for-merging-a-patch-to-master. As soon as your change and *its predecessors* get at least CR+1+2, you can merge it yourself (Submit button is what you're looking for). If you don't have time, I could take care about this patch set on holidays. Thanks a lot for that information. However, on the top i see "Submit" greyed out and upon hovering it says i dont have permission to Submit. It would be great if you could take of this patch and if possible others which have received +2 votes. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 07:32:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 08:03:23 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 31 Jan 2020 08:03:23 +0000 Subject: Change in pysim[master]: Fixed reading of MSISDN parameter In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: Fixed reading of MSISDN parameter ...................................................................... Patch Set 15: (2 comments) I will address those comments in the next patch https://gerrit.osmocom.org/c/pysim/+/16947/15//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16947/15//COMMIT_MSG at 7 PS15, Line 7: Fixed reading of MSISDN parameter > would be nice to add a brief explanation that this adds MSISDN parsing, and what kinds of MSISDN are [?] Ack https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16947/15/pySim-read.py at 222 PS15, Line 222: if bcd_len != int('ff', 16): > ACK. Ack -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 15 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 31 Jan 2020 08:03:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 11:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jan 2020 11:24:37 +0000 Subject: Change in libosmocore[master]: pcsc: don't leak memory In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory ...................................................................... Patch Set 1: > Hoernchen would like fixeria to review this change. Sorry, I am not familiar with the API of PC/SC. Neither the commit message explains any details... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 11:24:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 11:33:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jan 2020 11:33:55 +0000 Subject: Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 ) Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby ...................................................................... Patch Set 1: > Patch Set 1: > > Can you add a more detailed description why it should be handled. ACK. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Gerrit-Change-Number: 17080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 31 Jan 2020 11:33:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:43:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:43:47 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Patch Set 4: there may have been a permission problem. if you have time, please re-try if it's fixed now. thanks for your patience -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 14:43:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:44:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:44:24 +0000 Subject: Change in osmo-sgsn[master]: mm_state_gb_fsm: Handle implicit detach from mm_standby In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 ) Change subject: mm_state_gb_fsm: Handle implicit detach from mm_standby ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I63d04a2dcdc17b4df6616c515641c435d919c787 Gerrit-Change-Number: 17080 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Fri, 31 Jan 2020 14:44:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:45:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:45:05 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/17081 ) Change subject: gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/17081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I38cb31907eddeade5350cdb648df179408d908d2 Gerrit-Change-Number: 17081 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:45:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:46:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:46:12 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 ) Change subject: gprs_gmm_fsm.c: Implement RAT change between 2g and 3g ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 Gerrit-Change-Number: 15487 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:46:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:46:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:46:30 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17079 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f Gerrit-Change-Number: 17079 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 14:46:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:46:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:46:36 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17079 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... cardem: disable upload for simtrace2 cardem on the st2 has been broken forever and still does not work, so stop uploading cardem binaries Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3ed1345..7ddfa6e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -63,6 +63,8 @@ # make -C "$base/doc/manuals" publish #fi +rm -rf $TOPDIR/firmware/bin/simtrace-cardem* + if [ "x$publish" = "x--publish" ]; then echo echo "=============== UPLOAD BUILD ==============" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f Gerrit-Change-Number: 17079 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:49:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:49:51 +0000 Subject: Change in simtrace2[master]: cardem: disable upload for simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17079 ) Change subject: cardem: disable upload for simtrace2 ...................................................................... Patch Set 1: I also deleted all the existing simtrace-cardem-* on ftp.osmocom.org -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33828f799d41386afb3f8dcd9bb510902877e03f Gerrit-Change-Number: 17079 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 14:49:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:50:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:50:14 +0000 Subject: Change in libosmocore[master]: pcsc: don't leak memory In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 14:50:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:50:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:50:17 +0000 Subject: Change in libosmocore[master]: pcsc: don't leak memory In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17058 ) Change subject: pcsc: don't leak memory ...................................................................... pcsc: don't leak memory Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa --- M src/sim/reader_pcsc.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sim/reader_pcsc.c b/src/sim/reader_pcsc.c index 9e05e3c..04a8622 100644 --- a/src/sim/reader_pcsc.c +++ b/src/sim/reader_pcsc.c @@ -87,11 +87,14 @@ num_readers++; } - if (num != num_readers) + if (num != num_readers) { + SCardFreeMemory(st->hContext, mszReaders); goto end; + } st->name = talloc_strdup(rh, ptr); st->dwActiveProtocol = -1; + SCardFreeMemory(st->hContext, mszReaders); return rh; end: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183882ff2eae82754d55189b154863fad9cce4aa Gerrit-Change-Number: 17058 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:50:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:50:52 +0000 Subject: Change in osmo-hlr[master]: gsup_client.c: fix deprecation for client create func In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17057 ) Change subject: gsup_client.c: fix deprecation for client create func ...................................................................... gsup_client.c: fix deprecation for client create func Change-Id: Iab9f416519b5df3bd4683592b2976f16675d9be7 --- M src/gsupclient/gsup_client.c 1 file changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 814d5a2..52985c9 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -291,14 +291,15 @@ if (rc != 0) goto failed; - gsupc->link = ipa_client_conn_create(gsupc, - /* no e1inp */ NULL, - 0, - ip_addr, tcp_port, - gsup_client_updown_cb, - gsup_client_read_cb, - /* default write_cb */ NULL, - gsupc); + gsupc->link = ipa_client_conn_create2(gsupc, + /* no e1inp */ NULL, + 0, + /* no specific local IP:port */ NULL, 0, + ip_addr, tcp_port, + gsup_client_updown_cb, + gsup_client_read_cb, + /* default write_cb */ NULL, + gsupc); if (!gsupc->link) goto failed; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iab9f416519b5df3bd4683592b2976f16675d9be7 Gerrit-Change-Number: 17057 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:51:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:51:34 +0000 Subject: Change in osmo-hlr[master]: esme_dgsm.py: add --always-fail option for debugging SMPP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16793 ) Change subject: esme_dgsm.py: add --always-fail option for debugging SMPP ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibacf2676cae40712c89b57ced34085311d9a416d Gerrit-Change-Number: 16793 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:51:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:51:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:51:42 +0000 Subject: Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16763 ) Change subject: auc3g: officially wrap IND around IND_bitlen space ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:51:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:51:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:51:56 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 26: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 26 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 31 Jan 2020 14:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:52:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:52:00 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist ...................................................................... Patch Set 36: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 36 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:52:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:52:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:52:10 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 36: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 36 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:52:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:52:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:52:17 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16336 ) Change subject: gsup_server: send routing error back to the correct peer ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:52:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:52:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:52:45 +0000 Subject: Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16206 ) Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() ...................................................................... Patch Set 28: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:52:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:52:40 +0000 Subject: Change in osmo-hlr[master]: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16207 ) Change subject: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy ...................................................................... Patch Set 28: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 Gerrit-Change-Number: 16207 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:52:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:54:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:54:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: set titan.TestPorts.UDPasp_commit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17060 ) Change subject: deps: set titan.TestPorts.UDPasp_commit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17060 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: I141b906d2a5969afb5f6e27413fa1c18c54d5708 Gerrit-Change-Number: 17060 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 14:54:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:56:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 14:56:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_home In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 ) Change subject: hlr: add TC_MSLookup_mDNS_service_other_home ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16914 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: Ia7f92d33691f910549353b16a7b0efc18e521719 Gerrit-Change-Number: 16914 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 14:56:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:57:30 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 31 Jan 2020 14:57:30 +0000 Subject: Change in pysim[master]: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards In-Reply-To: References: Message-ID: herlesupreeth has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16941 ) Change subject: Added feature to program SPN into sysmoUSIM-SJS1 SIM cards ...................................................................... Added feature to program SPN into sysmoUSIM-SJS1 SIM cards Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce --- M pySim/cards.py M pysim-testdata/sysmoUSIM-SJS1.ok 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 9174ad5..faaeca3 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -612,6 +612,10 @@ content = "01" + p['opc'] data, sw = self._scc.update_binary('00F7', content) + # set Service Provider Name + content = enc_spn(p['name'], True, True) + data, sw = self._scc.update_binary('6F46', rpad(content, 32)) + # write EF.IMSI data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi'])) diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 5ad34e4..d9a9072 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -3,9 +3,9 @@ ICCID: 1122334455667788990 IMSI: 001010000000102 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 -SPN: -Display HPLMN: False -Display OPLMN: False +SPN: Magic +Display HPLMN: True +Display OPLMN: True PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia0f1a36ecb3898eaa1cf9925864e13369b1f31ce Gerrit-Change-Number: 16941 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 14:57:32 2020 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 31 Jan 2020 14:57:32 +0000 Subject: Change in pysim[master]: Fix file permission In-Reply-To: References: Message-ID: herlesupreeth has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16942 ) Change subject: Fix file permission ...................................................................... Fix file permission Change-Id: I893869329e9547e06386baf4d16a18e545042d62 --- M pySim-read.py 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/pySim-read.py b/pySim-read.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I893869329e9547e06386baf4d16a18e545042d62 Gerrit-Change-Number: 16942 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add emulated GSUP server (second HLR) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061 ) Change subject: hlr: add emulated GSUP server (second HLR) ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061/2/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061/2/hlr/HLR_Tests.ttcn at 238 PS2, Line 238: thread language-wise TTCN-3 doen't know the term "thread" but just "parallel test component". Ifyou want to draw analogies, I would expect the analogy to actually be more of a separate process,as there is no shared state between the components. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17061 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: Idbfe8a145c90a524145089a06d9bbefac4d7edd8 Gerrit-Change-Number: 17061 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:00:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:02:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:02:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types: add dest name to some messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17062 ) Change subject: library/GSUP_Types: add dest name to some messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17062 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: I7623b7a7c7a18ba18a38d0834979d18ab0fbb961 Gerrit-Change-Number: 17062 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:02:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:04:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:04:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/DNS_Helpers: add f_enc_IPv4 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063 ) Change subject: library/DNS_Helpers: add f_enc_IPv4 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063/2/library/DNS_Helpers.ttcn File library/DNS_Helpers.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063/2/library/DNS_Helpers.ttcn at 73 PS2, Line 73: function f_enc_IPv4(charstring str) return octetstring { I would normally give the function either a more descriptive name (linking it to something DNS specific) and/or mark it private. With that generic name, it is likely that other modules might implement a f_enc_IPv4, too, leading to namespace conflict warnings -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17063 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: I8a5450988711680c93cfd657a34db759a56bc41e Gerrit-Change-Number: 17063 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:04:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:07:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:07:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_GSUP_proxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 ) Change subject: hlr: add TC_MSLookup_GSUP_proxy ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17064 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: I945e651f1346e56dbe3c02d9d08ccd95cc8d6626 Gerrit-Change-Number: 17064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Fri, 31 Jan 2020 15:07:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:08:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:08:47 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17051 ) Change subject: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/17051/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/17051/1//COMMIT_MSG at 2 PS1, Line 2: Author: AndersBroman missing space? https://gerrit.osmocom.org/c/osmo-pcu/+/17051/1/src/gsm_rlcmac.h File src/gsm_rlcmac.h: https://gerrit.osmocom.org/c/osmo-pcu/+/17051/1/src/gsm_rlcmac.h at 1447 PS1, Line 1447: guint8 RB_ID; no indent here? is this to kee it wireshark style-compatible? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 Gerrit-Change-Number: 17051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:08:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:09:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:09:17 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17052 ) Change subject: gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I70d4ff3e137b5fd13d367bd4ea6ab501e81e7a87 Gerrit-Change-Number: 17052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:09:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:09:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:09:45 +0000 Subject: Change in osmo-pcu[master]: gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17053 ) Change subject: gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ASAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I808ec66011cdfe8e1193298f7fb7e92d25b45be4 Gerrit-Change-Number: 17053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:12:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:12:46 +0000 Subject: Change in pysim[master]: Fixed MCC and MCC representation in the output of pySim-read In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fixed MCC and MCC representation in the output of pySim-read ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:12:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:13:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:13:58 +0000 Subject: Change in pysim[master]: Support for MSISDN programming In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16946 ) Change subject: Support for MSISDN programming ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/16946/6/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/16946/6/pySim-read.py at 212 PS6, Line 212: res this can be removed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594 Gerrit-Change-Number: 16946 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 31 Jan 2020 15:13:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:14:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:14:40 +0000 Subject: Change in pysim[master]: Fixed update_hplmn_act method In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: Fixed update_hplmn_act method ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 31 Jan 2020 15:14:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:16:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:16:18 +0000 Subject: Change in osmo-ccid-firmware[master]: Implement serial number string descriptor in CTRL EP callback In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055 ) Change subject: Implement serial number string descriptor in CTRL EP callback ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I910eca1db4baa375bf604110301a0bde25ffcb26 Gerrit-Change-Number: 17055 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:16:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:17:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:17:03 +0000 Subject: Change in osmo-ccid-firmware[master]: WIP: Add DFU runtime descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17033 ) Change subject: WIP: Add DFU runtime descriptor ...................................................................... Patch Set 2: Code-Review+1 Is this still WIP or should it be reviewed for merge? -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I031c2353248873735698c845f591537779eee995 Gerrit-Change-Number: 17033 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:17:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:18:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:18:38 +0000 Subject: Change in osmo-ccid-firmware[master]: git version appended to the product usb string descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 ) Change subject: git version appended to the product usb string descriptor ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035/3/sysmoOCTSIM/main.c File sysmoOCTSIM/main.c: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035/3/sysmoOCTSIM/main.c at 454 PS3, Line 454: char product_buf[] = "sysmoOCTSIM "GIT_VERSION; could be const (and hence in flash/rom) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 Gerrit-Change-Number: 17035 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:18:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:18:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:18:47 +0000 Subject: Change in osmo-ccid-firmware[master]: usb dfu header cleanup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 ) Change subject: usb dfu header cleanup ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I689d7122872b28444b6c5343df3bac0c30f23b1d Gerrit-Change-Number: 17037 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:18:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:19:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:19:24 +0000 Subject: Change in osmo-ccid-firmware[master]: dfu: proper product name for dfu runtime descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17056 ) Change subject: dfu: proper product name for dfu runtime descriptor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ifa37c63c97824ce42b3476f53626323cb40b879e Gerrit-Change-Number: 17056 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:19:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:20:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:20:10 +0000 Subject: Change in osmo-ci[master]: ansible: mdbus2 is not nowadays available on Debian10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17070 ) Change subject: ansible: mdbus2 is not nowadays available on Debian10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0eb2ed28d9e3bc9054ffeb81c9e6fb5428af5bfb Gerrit-Change-Number: 17070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:20:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:20:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:20:24 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Install srsLTE dependencies In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17066 ) Change subject: ansible: gsm-tester: Install srsLTE dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia6804d0d0c40ad2ebe8a09b0861f14f15578a834 Gerrit-Change-Number: 17066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:20:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:20:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:20:51 +0000 Subject: Change in osmo-ci[master]: jobs: Introduce osmo-gsm-tester_build-srslte In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17068 ) Change subject: jobs: Introduce osmo-gsm-tester_build-srslte ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08a59c6065ca4fb6fbbed5b12e73abf4024f1dcb Gerrit-Change-Number: 17068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:21:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:21:07 +0000 Subject: Change in osmo-ci[master]: Install srsLTE build dependencies in jenkins buildhosts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17069 ) Change subject: Install srsLTE build dependencies in jenkins buildhosts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib42987416ee90868ab088bfa2f92d92c764088b0 Gerrit-Change-Number: 17069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:21:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:22:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:22:08 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce RemoteHost and refactor code to use it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065 ) Change subject: Introduce RemoteHost and refactor code to use it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ifff5ded8fdb28e8ef267cebe6c5f30a910cae11a Gerrit-Change-Number: 17065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:22:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:23:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:23:35 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add scripts to build srsLTE software In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 ) Change subject: contrib: Add scripts to build srsLTE software ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067/1/src/osmo_gsm_tester/test.py File src/osmo_gsm_tester/test.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067/1/src/osmo_gsm_tester/test.py at a1 PS1, Line 1: # osmo_gsm_tester: test class is removing this file inherently related ot srsLTE buld scripts? looks like an accidential change -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id9d63920a44a80af187e649c9be5fd7498fa5f44 Gerrit-Change-Number: 17067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:23:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:24:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_other_proxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075 ) Change subject: hlr: add TC_MSLookup_mDNS_service_other_proxy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17075 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: I2c956119783972b5e6828bed7554a8a79984d8a2 Gerrit-Change-Number: 17075 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:24:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:24:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:24:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_proxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17074 ) Change subject: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_proxy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17074 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: Ic42c909e6540b2294b1109dc19c1df348224457b Gerrit-Change-Number: 17074 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:24:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:24:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:24:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_home In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17073 ) Change subject: hlr: add TC_MSLookup_mDNS_service_GSUP_HLR_home ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17073 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: Id567989e4be7ac2d3857d3ea61a1ca3a2401a8dc Gerrit-Change-Number: 17073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jan 2020 15:24:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:25:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:25:50 +0000 Subject: Change in osmo-ccid-firmware[master]: Implement serial number string descriptor in CTRL EP callback In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 ) Change subject: Implement serial number string descriptor in CTRL EP callback ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I428972df2cd35c4a5d9774c8ca8ece5109927fa9 Gerrit-Change-Number: 16521 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:27:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:27:46 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 31 Jan 2020 15:27:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:27:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:27:51 +0000 Subject: Change in osmo-hlr[master]: mdns_rfc.c: fix possible access of uninit. mem In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16846 ) Change subject: mdns_rfc.c: fix possible access of uninit. mem ...................................................................... mdns_rfc.c: fix possible access of uninit. mem Fixes: CID#207548 Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 --- M src/mslookup/mdns_rfc.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/mslookup/mdns_rfc.c b/src/mslookup/mdns_rfc.c index e1fc184..6f39a8e 100644 --- a/src/mslookup/mdns_rfc.c +++ b/src/mslookup/mdns_rfc.c @@ -83,7 +83,12 @@ return NULL; while (*qname) { - size_t len = *qname; + size_t len; + + if (i >= qname_max_len) + return NULL; + + len = *qname; next_label = qname + len + 1; if (next_label >= qname_end || i + len > OSMO_MDNS_RFC_MAX_NAME_LEN) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifa269d8a88d84c01349668cdd8d1f1d24c12c6d8 Gerrit-Change-Number: 16846 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:30:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:30:09 +0000 Subject: Change in osmo-gsm-manuals[master]: fix srcdir to reflect $abs_srcdir In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 ) Change subject: fix srcdir to reflect $abs_srcdir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b Gerrit-Change-Number: 16990 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 15:30:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:30:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:30:13 +0000 Subject: Change in osmo-gsm-manuals[master]: fix srcdir to reflect $abs_srcdir In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 ) Change subject: fix srcdir to reflect $abs_srcdir ...................................................................... fix srcdir to reflect $abs_srcdir When building .adoc files, we pass a srcdir variable to allow including files that are only in the source tree, but not in the build tree. However, so far {srcdir} is a relative path, and when an .adoc file includes an .adoc file in a subdir, then the directive include::{srcdir} is evaluated relative to the .adoc file in the subdir, not in the original make CWD. Hence the path ends up pointing at the wrong place. Fix this by passing an absolute path as srcdir instead. I discovered this here: osmo-hlr/doc/manuals/osmohlr-usermanual.adoc: include::{srcdir}/chapters/proxy_cache.adoc[] osmo-hlr/doc/manuals/chapters/proxy_cache.adoc: ["mscgen"] ---- include::{srcdir}/chapters/proxy_cache_attach.msc[] ---- (Note that I could have just removed "{srcdir}/chapters/" since .adoc and .msc are in the same dir, but the point of this patch is to make {srcdir} generally useful in all levels of included .adoc files.) The above resulted in: asciidoc: include: /n/s/dev/src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: osmohlr-usermanual.adoc: line 29: reading: /n/s/dev/src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: WARNING: proxy_cache.adoc: line 263: include file not found: /n/s/dev/src/src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc Note that /n/s/dev/src/src/osmo-hlr should only have one 'src' element. With $abs_srcdir this becomes: asciidoc: include: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: osmohlr-usermanual.adoc: line 29: reading: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache.adoc asciidoc: include: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc asciidoc: proxy_cache.adoc: line 263: reading: /n/s/dev/make/osmo-hlr/../../src/osmo-hlr/doc/manuals/chapters/proxy_cache_attach.msc I have not investigated whether/why all the other 'include::' all over the place seem to be working -- maybe we never include .adoc in subdirectories that in turn use {srcdir}? Or we have lots of missing images we didn't notice yet? Todo: the missing include should have fatally broken the build, but it just builds the PDF with missing images. a) the mscgen plugin finding empty content and b) the missing .png files should have caused the build to abort? Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 54969fc..63c2bea 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -37,7 +37,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(abs_srcdir)' -a commondir='$(COMMONDIR)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If847f16eab3ddba6009f67ed641b48805467eb1b Gerrit-Change-Number: 16990 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:30:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:30:54 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 31 Jan 2020 15:30:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jan 31 15:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jan 2020 15:31:02 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17007 ) Change subject: gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' ...................................................................... gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' The 'gprs_llc' is defined as a pure C structure with C++ specific extensions (methods), so it's rather a class. Accessing its field 'frame' statically causes Clang to throw a compilation error: gprs_bssgp_pcu.cpp:111:29: error: invalid use of non-static data member 'frame' if (len > sizeof(gprs_llc::frame)) Let's avoid this and use LLC_MAX_LEN as the size limitation. God knows what to expect from such a mix of C++ and C... Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index f00fc94..080245a 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -108,7 +108,7 @@ data = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_LLC_PDU); len = TLVP_LEN(tp, BSSGP_IE_LLC_PDU); - if (len > sizeof(gprs_llc::frame)) + if (len > sizeof(LLC_MAX_LEN)) { LOGP(DBSSGP, LOGL_NOTICE, "BSSGP TLLI=0x%08x Rx UL-UD IE_LLC_PDU too large\n", tlli); return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f84bd776cc780a45880f136107f6e0bc56241d1 Gerrit-Change-Number: 17007 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: